Release 0.12.11

# History

## 0.12.11

### Bug Fixes

- #3238: @josegonzalez Handle proxy issues in app renaming
- #3234: @mashrikt Unset GIT_QUARANTINE_PATH when updating repo submodule
- #3223: @josegonzalez Get the global scheduler if no app is specified
- #3218: @wcalandro Fix error text when using "dokku plugin:uninstall"

### New Features

- #3242: @josegonzalez Upgrade herokuish to 0.4.3
- #3241: @josegonzalez Add a subcommand for retrieving failed app deploy logs
- #3237: @josegonzalez Support --quiet header when showing all environment variables

### Documentation

- #3235: @josegonzalez Switch from ps:rebuild to ps:restart
- #3221: @josegonzalez Better callout for why env vars do not get applied to dockerfile builds

.dockerignore

@@ -7,3 +7,4 @@ docs
 tests
 !contrib/dokku-installer.py
 !contrib/dokku-update
+!contrib/bash-completion

.stickler.yml

@@ -1,7 +1,7 @@
 linters:
   shellcheck:
     shell: bash
-    exclude: SC2034,SC1090
+    exclude: SC2034,SC1090,SC2191
   golint:
 
 files:

HISTORY.md

@@ -1,5 +1,210 @@
 # History
 
+## 0.12.11
+
+### Bug Fixes
+
+- #3238: @josegonzalez Handle proxy issues in app renaming
+- #3234: @mashrikt Unset GIT_QUARANTINE_PATH when updating repo submodule
+- #3223: @josegonzalez Get the global scheduler if no app is specified
+- #3218: @wcalandro Fix error text when using "dokku plugin:uninstall"
+
+### New Features
+
+- #3242: @josegonzalez Upgrade herokuish to 0.4.3
+- #3241: @josegonzalez Add a subcommand for retrieving failed app deploy logs
+- #3237: @josegonzalez Support --quiet header when showing all environment variables
+
+### Documentation
+
+- #3235: @josegonzalez Switch from ps:rebuild to ps:restart
+- #3221: @josegonzalez Better callout for why env vars do not get applied to dockerfile builds
+
+## 0.12.10
+
+### New Features
+
+- #3214: @josegonzalez Add net-tools as a dependency to debian installs
+
+## 0.12.9
+
+### Bug Fixes
+
+- #3212: @josegonzalez Add missing config source
+
+## 0.12.8
+
+### Bug Fixes
+
+- #3211: @josegonzalez Add missing source of config/functions
+
+### Documentation
+
+- #3204: @znz Add `--no-restart` to `config:unset` of `config:help`
+- #3203: @josegonzalez Clarify issue template
+
+## 0.12.7
+
+### Bug Fixes
+
+- #3200: @josegonzalez fix: correct bash-completion integration
+
+### New Features
+
+- #3199: @josegonzalez Update herokuish to 0.4.2
+- #3198: @josegonzalez Cleanup temporary changes during betafish releases
+
+## 0.12.6
+
+### Bug Fixes
+
+- #3193: @josegonzalez Install bash-completion files correctly
+- #3179: @josegonzalez Ignore issues with popd when OS versions with stricter security
+- #3177: @philm ensure dokku-redeploy runs when docker is stopped then started
+- #3176: @josegonzalez Detect mixed running status on service start
+
+### New Features
+
+- #3195: @josegonzalez Allow lower versions of docker-engine
+- #3181: @malixsys Adding support for `http2_push_preload` to nginx 1.13.9+ configuration
+- #3183: @josegonzalez Unskip initial herokuish test
+- #3175: @josegonzalez Implement bash-completion for commands
+
+### Documentation
+
+- #3197: @josegonzalez Add a tutorial for deploying applications via gitlab ci
+- #3194: @josegonzalez Clarify why dokku report information is useful
+- #3189: @josegonzalez Correct issue with adding a user remotely
+
+## 0.12.5
+
+### Bug Fixes
+
+- #3173: @josegonzalez fix: do not output error message twice
+
+### New Features
+
+- #3172: @josegonzalez feat: Add the ability to ignore existing applications during a git clone
+- #3171: @josegonzalez Allow users to override the reported app url
+- #3170: @josegonzalez Add ps:startall command
+
+### Documentation
+
+- #3159: @zuck Improve docs for default site with HTTPS
+
+## 0.12.4
+
+### Bug Fixes
+
+- #3168: @josegonzalez Use correct variable name when writing deploy-branch value
+
+## 0.12.3
+
+### Bug Fixes
+
+- #3156: @josegonzalez fix: ensure we _always_ include all types in history output
+
+### Documentation
+
+- #3163: @josegonzalez Better apt install formatting
+
+### Other
+
+- #3153: @scjody Allow specifying a separate DOKKU_HOST_ROOT
+
+## 0.12.2
+
+### Bug Fixes
+
+- #3155: @josegonzalez fix: re-add is_container_running
+
+## 0.12.1
+
+### Bug Fixes
+
+- #3151: @josegonzalez fix: include missing config/functions source
+
+## 0.12.0
+
+### Bug Fixes
+
+- #3146: @josegonzalez Fix non ubuntu installs
+- #3138: @josegonzalez Use correct path for /etc/default file
+- #3137: @josegonzalez Ensure we can disable setting the rev-env-var
+- #3131: @axilleas Capitalize log sentence when renaming containers
+- #3128: @Modicrumb Improve windows vagrant experience
+- #3105: @znz Follow renaming from deploy-method to deploy-source
+- #3101: @josegonzalez Handle stopped nginx during debian installation
+
+### New Features
+
+- #3141: @josegonzalez Centralize app existence checks into the apps plugin
+- #3147: @josegonzalez Create proxy:ports-set call
+- #3145: @josegonzalez Add report trigger
+- #3144: @josegonzalez Increase curl max timeout to 600 seconds (10 minutes)
+- #3107: @znz Remove unused password in ssl cert generation
+- #3095: @josegonzalez Migrate env for NGINX_* to PROXY_*
+- #3140: @josegonzalez Add newline to config:get output
+- #3139: @josegonzalez Add ability to initialize a git repository out of band
+- #3111: @josegonzalez Upgrade herokuish to 0.4.0
+- #3110: @josegonzalez Upgrade herokuish to 0.3.36
+- #3106: @znz Remove unnecessary shellcheck disable
+- #3098: @josegonzalez Pull herokuish from docker hub when installing via package
+- #3100: @josegonzalez Properly handle invalid process type entries during DOKKU_SCALE generation
+- #3097: @josegonzalez Update herokuish to 0.3.35
+
+### Documentation
+
+- #3148: @josegonzalez Use consistent terms for domains, apps, and commands
+- #3135: @josegonzalez Revert "Clarify that the checks plugin only matches content start"
+- #3134: @tomdyson Fix typo in upgrading docs
+- #3119: @TomasHubelbauer Link through to the application deployment page after the installation
+- #3118: @Tyilo Clarify that the checks plugin only matches content start
+- #3113: @ilyapoz Fix proxy management link
+- #3112: @josegonzalez Minor doc css fixes
+- #3104: @sarendsen Add dokku-limit to plugins documentation
+- #3108: @znz Update plugin list output
+
+## 0.11.6
+
+### Bug Fixes
+
+- #3091: @josegonzalez Properly trigger tar-based deploys on git-deployed repositories
+- #3076: @Kjwon15 Prune worktree after build
+- #3090: @josegonzalez Ensure all plugin triggers have docs and events integration
+- #3089: @josegonzalez Use a longer password for self-signed certificates
+
+### New Features
+
+- #2950: @adelq Add configuration option to disable automatic app creation
+- #3093: @josegonzalez Add subcommands to allow app locking and unlocking
+- #3092: @josegonzalez Add support for configuring the app shell
+
+### Documentation
+
+- #3096: @josegonzalez docs: Document how to check on a running dokku-installer
+
+## 0.11.5
+
+### Bug Fixes
+
+- #3088: @josegonzalez Silence port retrieval stderr
+- #3086: @josegonzalez Fix help output for golang plugins
+- #3079: @josegonzalez Move container status exclusively to ps plugin
+
+### New Features
+
+- #3085: @josegonzalez Add support for checking if an application exists
+- #3032: @josegonzalez Add support for arbitrary ubuntu versions
+- #3074: @josegonzalez Add the ability to disable ANSI prefixes via DOKKU_DISABLE_ANSI_PREFIX_REMOVAL
+- #3083: @josegonzalez Source /etc/defaults/dokku if available
+
+### Documentation
+
+- #2958: @silverfix Add tutorial for running Dokku on an external volume
+- #3082: @josegonzalez Switch from Gratipay to Patreon
+- #3081: @josegonzalez Add docs for switching between deployment methodologies
+
 ## 0.11.4
 
 ### Bug Fixes

ISSUE_TEMPLATE.md

@@ -1,20 +1,32 @@
 > If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
 
-Description of problem:
+## Description of problem
 
+### How reproducible
 
-Output of the following commands
+### Steps to Reproduce
 
-<!-- If you're running 0.4.10+ just use dokku report-->
+1.
+2.
+3.
+
+#### Actual Results
+
+#### Expected Results
+
+## Environment Information
+
+### `dokku report APP_NAME` output
+
+> 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.
+
+### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?:
+
+### Additional information
 
-- `uname -a`:
-- `free -m`:
-- `docker version`:
-- `docker -D info`:
-- `sigil -v`:
-- `docker run -ti gliderlabs/herokuish:latest herokuish version`:
-- `dokku version`:
-- `dokku plugin`:
 - `docker inspect CONTAINER_ID` (if applicable):
   (BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
 - `cat /home/dokku/<app>/nginx.conf` (if applicable):
@@ -27,23 +39,3 @@ Output of the following commands
   - 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):
-
-Environment details (AWS, VirtualBox, physical, etc.):
-
-How was Dokku installed?:
-
-How reproducible:
-
-
-Steps to Reproduce:
-1.
-2.
-3.
-
-Actual Results:
-
-
-Expected Results:
-
-
-Additional info:

Makefile

@@ -26,7 +26,7 @@ endif
 
 include common.mk
 
-.PHONY: all apt-update install version copyfiles man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
+.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
 
 include tests.mk
 include deb.mk
@@ -38,17 +38,6 @@ all:
 
 install: dependencies version copyfiles plugin-dependencies plugins
 
-release: deb-all rpm-all package_cloud packer
-
-package_cloud:
-	package_cloud push dokku/dokku/ubuntu/trusty herokuish*.deb
-	package_cloud push dokku/dokku/ubuntu/trusty sshcommand*.deb
-	package_cloud push dokku/dokku/ubuntu/trusty plugn*.deb
-	package_cloud push dokku/dokku/ubuntu/trusty dokku*.deb
-	package_cloud push dokku/dokku/el/7 herokuish*.rpm
-	package_cloud push dokku/dokku/el/7 sshcommand*.rpm
-	package_cloud push dokku/dokku/el/7 plugn*.rpm
-	package_cloud push dokku/dokku/el/7 dokku*.rpm
 
 packer:
 	packer build contrib/packer.json
@@ -61,6 +50,15 @@ go-build:
 		fi ;\
 	done
 
+
+go-build-plugin:
+ifndef PLUGIN_NAME
+	$(error PLUGIN_NAME not specified)
+endif
+	if [ -e plugins/$(PLUGIN_NAME)/Makefile ]; then \
+		$(MAKE) -e -C plugins/$(PLUGIN_NAME) $(PLUGIN_MAKE_TARGET) || exit $$? ;\
+	fi
+
 go-clean:
 	basedir=$(PWD); \
 	for dir in plugins/*; do \
@@ -76,24 +74,29 @@ copyfiles:
 	rm -rf ${CORE_PLUGINS_PATH}/*
 	test -d ${CORE_PLUGINS_PATH}/enabled || PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn init
 	test -d ${PLUGINS_PATH}/enabled || PLUGIN_PATH=${PLUGINS_PATH} plugn init
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do \
-		rm -Rf ${CORE_PLUGINS_PATH}/available/$$plugin && \
-		rm -Rf ${PLUGINS_PATH}/available/$$plugin && \
-		rm -rf ${CORE_PLUGINS_PATH}/$$plugin && \
-		rm -rf ${PLUGINS_PATH}/$$plugin && \
-		cp -R plugins/$$plugin ${CORE_PLUGINS_PATH}/available && \
-		rm -rf ${CORE_PLUGINS_PATH}/available/$$plugin/src && \
-		ln -s ${CORE_PLUGINS_PATH}/available/$$plugin ${PLUGINS_PATH}/available; \
-		find /var/lib/dokku/ -xtype l -delete;\
-		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $$plugin ;\
-		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $$plugin ;\
-	done
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do $(MAKE) copyplugin PLUGIN_NAME=$$plugin; done
 ifndef SKIP_GO_CLEAN
 	$(MAKE) go-clean
 endif
 	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
 	$(MAKE) addman
 
+copyplugin:
+ifndef PLUGIN_NAME
+	$(error PLUGIN_NAME not specified)
+endif
+	rm -Rf ${CORE_PLUGINS_PATH}/available/$(PLUGIN_NAME) && \
+		rm -Rf ${PLUGINS_PATH}/available/$(PLUGIN_NAME) && \
+		rm -rf ${CORE_PLUGINS_PATH}/$(PLUGIN_NAME) && \
+		rm -rf ${PLUGINS_PATH}/$(PLUGIN_NAME) && \
+		cp -R plugins/$(PLUGIN_NAME) ${CORE_PLUGINS_PATH}/available && \
+		rm -rf ${CORE_PLUGINS_PATH}/available/$(PLUGIN_NAME)/src && \
+		ln -s ${CORE_PLUGINS_PATH}/available/$(PLUGIN_NAME) ${PLUGINS_PATH}/available; \
+		find /var/lib/dokku/ -xtype l -delete;\
+		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $(PLUGIN_NAME) ;\
+		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $(PLUGIN_NAME)
+	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
+
 addman: help2man man-db
 	mkdir -p /usr/local/share/man/man1
 	help2man -Nh help -v version -n "configure and get information from your dokku installation" -o /usr/local/share/man/man1/dokku.1 dokku

README.md

@@ -7,7 +7,7 @@
 [![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg?style=flat-square "Viewdocs")](http://dokku.viewdocs.io/dokku/)
 [![OpenCollective](https://opencollective.com/dokku/sponsors/badge.svg?style=flat-square)](#sponsors)
 [![OpenCollective](https://opencollective.com/dokku/backers/badge.svg?style=flat-square)](#backers)
-[![Gratipay](https://img.shields.io/gratipay/dokku.svg?style=flat-square)](https://gratipay.com/dokku/)
+[![Patreon](https://img.shields.io/badge/patreon-donate-green.svg?style=flat-square)](https://www.patreon.com/dokku/)
 
 Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 
@@ -99,8 +99,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.11.4/bootstrap.sh
-sudo DOKKU_TAG=v0.11.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.12.11/bootstrap.sh
+sudo DOKKU_TAG=v0.12.11 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.

Vagrantfile

@@ -66,8 +66,8 @@ 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"
-    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 ./ && bash bootstrap.sh"
+    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
 
   config.vm.define "dokku-deb", autostart: false do |vm|

bootstrap.sh

@@ -46,13 +46,20 @@ install-dokku() {
     minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}')
     patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}')
 
+    use_plugin=false
+    # 0.4.0 implemented a `plugin` plugin
+    if [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
+      use_plugin=true
+    elif [[ "$major" -ge "1" ]]; then
+      use_plugin=true
+    fi
+
     # 0.3.13 was the first version with a debian package
     if [[ "$major" -eq "0" ]] && [[ "$minor" -eq "3" ]] && [[ "$patch" -ge "13" ]]; then
       install-dokku-from-package "$DOKKU_SEMVER"
       echo "--> Running post-install dependency installation"
       dokku plugins-install-dependencies
-    # 0.4.0 implemented a `plugin` plugin
-    elif [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
+    elif [[ "$use_plugin" == "true" ]]; then
       install-dokku-from-package "$DOKKU_SEMVER"
       echo "--> Running post-install dependency installation"
       sudo -E dokku plugin:install-dependencies --core
@@ -101,9 +108,20 @@ install-dokku-from-package() {
   esac
 }
 
+in-array() {
+  declare desc="return true if value ($1) is in list (all other arguments)"
+
+  local e
+  for e in "${@:2}"; do
+    [[ "$e" == "$1" ]] && return 0
+  done
+  return 1
+}
+
 install-dokku-from-deb-package() {
   local DOKKU_CHECKOUT="$1"
   local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
+  local OS_ID
 
   if [[ -n $DOKKU_DOCKERFILE ]]; then
     NO_INSTALL_RECOMMENDS=" --no-install-recommends "
@@ -127,9 +145,27 @@ install-dokku-from-deb-package() {
     add-apt-repository -y ppa:nginx/stable
   fi
 
+  OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
+  if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
+    DOKKU_DISTRO="ubuntu"
+    OS_ID="trusty"
+  fi
+
+  if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
+    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
+      OS_ID="trusty"
+    fi
+  elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
+    OS_IDS=("wheezy" "jessie" "stretch" "buster")
+    if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
+      OS_ID="stretch"
+    fi
+  fi
+
   echo "--> Installing dokku"
   wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
-  echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list
+  echo "deb https://packagecloud.io/dokku/dokku/$DOKKU_DISTRO/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
   apt-get update -qq > /dev/null
 
   [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE"   | sudo debconf-set-selections

contrib/bash-completion

@@ -0,0 +1,31 @@
+# bash completion for dd                                   -*- shell-script -*-
+
+_dokku_complete_verify() {
+  declare desc="shows bash completion"
+  declare COMMAND="$1"
+  local COMMANDS=""
+
+  _dokku_complete_goals=$(cat "/var/cache/dokku-completion")
+
+  while read -r fn; do
+    if [[ -z "$COMMAND" ]] || [[ "$fn" == $COMMAND* ]]; then
+      COMMANDS="${COMMANDS};${fn}"
+    fi
+  done <<< "$_dokku_complete_goals"
+
+  echo "${COMMANDS#";"}"
+}
+
+_dokku() {
+  local cur prev
+  _get_comp_words_by_ref -n : cur
+
+  if [[ ! -f "/var/cache/dokku-completion" ]] || [[ ! -s "/var/cache/dokku-completion" ]]; then
+    dokku --quiet help --all | awk '/^    /{ print $1 }' | sort > "/var/cache/dokku-completion"
+  fi
+
+  opts=$(_dokku_complete_verify "${cur}")
+  COMPREPLY=($(IFS=";" compgen -W "$opts" -- "$cur"))
+  __ltrim_colon_completions "$cur"
+} &&
+complete -F _dokku dokku

contrib/dokku-installer.py

@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.11.4'
+VERSION = 'v0.12.11'
 
 hostname = ''
 try:

contrib/dokku-update

@@ -2,9 +2,30 @@
 set -eo pipefail
 shopt -s nullglob
 
+if [[ -r /etc/default/dokku ]]; then
+  # shellcheck disable=SC1091
+  source /etc/default/dokku
+fi
+
 export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
-[[ -f $DOKKU_ROOT/dokkurc ]] && source "$DOKKU_ROOT/dokkurc"
-[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source "$f"; done
+if [[ -f "$DOKKU_ROOT/dokkurc" ]]; then
+  if [[ -r $DOKKU_ROOT/dokkurc ]]; then
+    source "$DOKKU_ROOT/dokkurc"
+  else
+    echo "Unable to read $DOKKU_ROOT/dokkurc for sourcing" 1>&2
+    exit 1
+  fi
+fi
+if [[ -d $DOKKU_ROOT/.dokkurc ]]; then
+  for f in $DOKKU_ROOT/.dokkurc/*; do
+    if [[ -r "$f" ]]; then
+      source "$f"
+    else
+      echo "Unable to read $f for sourcing" 1>&2
+      exit 1
+    fi
+  done
+fi
 [[ $DOKKU_TRACE ]] && set -x
 
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}

contrib/dokku_client.sh

@@ -139,7 +139,7 @@ main() {
   esac
 
   [[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
-  [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore " == *" $CMD "* ]] && unset APP
+  [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore ps:startall ps:stopall " == *" $CMD "* ]] && unset APP
   [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
   [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
   [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"

contrib/herokuish-build.Dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
+RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+
+ARG WORKDIR=/go/src/github.com/dokku/dokku
+
+WORKDIR ${WORKDIR}
+
+COPY . ${WORKDIR}
+
+RUN make deb-herokuish rpm-herokuish
+
+RUN mkdir -p /data \
+    && cp /tmp/*.deb /data \
+    && cp /tmp/*.rpm /data \
+    && ls -lha /data/

contrib/release

@@ -129,13 +129,39 @@ fn-version-next() {
 fn-publish-package() {
   declare desc="Publishes a package to packagecloud"
   declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
-  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu/trusty
+  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu EXIT_CODE=0
+  local OS_ID ex
 
   [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
-  log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
-  package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
-  return "$?"
+
+  if [[ "$DIST" == "ubuntu" ]]; then
+    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+
+    DIST=debian
+    OS_IDS=("wheezy" "jessie" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  else
+    log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
+    package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
+    EXIT_CODE="$?"
+  fi
+  return "$EXIT_CODE"
 }
 
 fn-replace-version() {
@@ -211,7 +237,7 @@ fn-repo-update-history-and-commit() {
   declare desc="Updates the history file and commits the changes"
   declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
   local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
-  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG ISSUE_FILE
+  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG HISTORY_OTHER ISSUE_FILE
 
   pushd "$ROOT_DIR" >/dev/null
 
@@ -232,8 +258,10 @@ fn-repo-update-history-and-commit() {
       HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "documentation" ]]; then
       HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
-    elif [[ "$TYPE" == "enhancement" ]]; then
+    elif [[ "$TYPE" == "enhancement" ]] || [[ "$TYPE" == "refactor" ]]; then
       HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
+    else
+      HISTORY_OTHER="${HISTORY_OTHER}"$'\n'"$CHANGELOG_TEXT"
     fi
   done
 
@@ -255,6 +283,11 @@ fn-repo-update-history-and-commit() {
     HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION"
   fi
 
+  if [[ "$HISTORY_OTHER" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Other"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER"
+  fi
+
   sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak
   HISTORY_CONTENTS="$(cat HISTORY.md)"
   echo -e "$HISTORY\n$HISTORY_CONTENTS" >HISTORY.md
@@ -274,7 +307,7 @@ fn-require-bin() {
 
 main() {
   declare RELEASE="$1"
-  local CURRENT_VERSION NEXT_VERSION IS_RELEASE major minor patch versions
+  local CURRENT_VERSION NEXT_VERSION IS_RELEASE
   local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
 
   if [[ "$RELEASE" == '--trace' ]]; then
@@ -302,22 +335,21 @@ main() {
 
   fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
 
-  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION"
-  [[ "$?" == 0 ]] || log-fail "Error building package"
+  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
 
-  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb"
-  [[ "$?" == 0 ]] || log-fail "Error extracting deb 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"
-  [[ "$?" == 0 ]] || log-fail "Error extracting rpm package"
+  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
 
-  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb"
-  [[ "$?" == 0 ]] || log-fail "Error publishing deb package"
+  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
 
-  fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm"
-  [[ "$?" == 0 ]] || log-fail "Error publishing rpm package"
+  fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
 
   fn-repo-push-tags "$IS_RELEASE"
+  if [[ "$IS_RELEASE" != "true" ]]; then
+    git reset -q HEAD plugins/*/plugin.toml
+    git checkout -- plugins/*/plugin.toml
+  fi
 }
 
 main "$@"

contrib/release-dokku-update

@@ -53,14 +53,40 @@ fn-extract-package() {
 
 fn-publish-package() {
   declare desc="Publishes a package to packagecloud"
-  declare RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
-  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu/trusty
+  declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
+  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
+  local OS_ID ex EXIT_CODE=0
 
-  [[ "$RELEASE" != "betafish" ]] && REPOSITORY=dokku/dokku
+  [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
-  log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
-  package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
-  return "$?"
+
+  if [[ "$DIST" == "ubuntu" ]]; then
+    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  
+    DIST=debian
+    OS_IDS=("wheezy" "jessie" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  else
+    log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
+    package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
+    EXIT_CODE="$?"
+  fi
+  return "$EXIT_CODE"
 }
 
 fn-in-array() {
@@ -73,6 +99,17 @@ fn-in-array() {
   return 1
 }
 
+fn-is-release() {
+  declare desc="Checks if a given run is a release run"
+  declare RELEASE="$1"
+  local IS_RELEASE=false
+  if [[ "$RELEASE" == "major" ]] || [[ "$RELEASE" == "minor" ]] || [[ "$RELEASE" == "patch" ]]; then
+    IS_RELEASE=true
+  fi
+
+  echo "$IS_RELEASE"
+}
+
 fn-require-bin() {
   declare desc="Checks that a binary exists"
   declare BINARY="$1"
@@ -83,7 +120,7 @@ fn-require-bin() {
 
 main() {
   declare RELEASE="$1"
-  local CURRENT_VERSION NEXT_VERSION major minor patch versions
+  local NEXT_VERSION
   local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
 
   if [[ "$RELEASE" == '--trace' ]]; then
@@ -105,6 +142,7 @@ main() {
   [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
 
   NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
 
   fn-build-dokku || log-fail "Error building package"
 
@@ -112,10 +150,9 @@ main() {
 
   fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
 
-  fn-publish-package "$RELEASE" "deb" "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
-
-  fn-publish-package "$RELEASE" "rpm" "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  fn-publish-package "$IS_RELEASE" "deb" "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
 
+  fn-publish-package "$IS_RELEASE" "rpm" "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
 }
 
 main "$@"

contrib/release-herokuish

@@ -0,0 +1,156 @@
+#!/usr/bin/env bash
+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 DOKKU_GIT_REV="$(git rev-parse HEAD)"
+
+trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+
+log-info() {
+  # shellcheck disable=SC2034
+  declare desc="Log info formatter"
+  echo "$*"
+}
+
+log-error() {
+  # shellcheck disable=SC2034
+  declare desc="Log error formatter"
+  echo "!   $*" 1>&2
+}
+
+log-fail() {
+  # shellcheck disable=SC2034
+  declare desc="Log fail formatter"
+  log-error "$*"
+  exit -1
+}
+
+fn-build-dokku() {
+  declare desc="Builds dokku packages within a docker container"
+
+  pushd "$ROOT_DIR" >/dev/null
+  docker build \
+    -f "contrib/herokuish-build.Dockerfile" \
+    -t herokuish:build .
+  return "$?"
+}
+
+fn-extract-package() {
+  declare desc="Extract packages from a docker container to the root directory"
+  declare PACKAGE_NAME="$1"
+
+  if [[ -z "$PACKAGE_NAME" ]]; then
+    log-error "Invalid deb file specified"
+    return 1
+  fi
+
+  log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
+  docker run --rm --entrypoint cat herokuish:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  return "$?"
+}
+
+fn-publish-package() {
+  declare desc="Publishes a package to packagecloud"
+  declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
+  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
+  local OS_ID ex EXIT_CODE=0
+
+  [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
+  [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
+
+  if [[ "$DIST" == "ubuntu" ]]; then
+    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  
+    DIST=debian
+    OS_IDS=("wheezy" "jessie" "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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  else
+    log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
+    package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
+    EXIT_CODE="$?"
+  fi
+  return "$EXIT_CODE"
+}
+
+fn-in-array() {
+  declare desc="return true if value ($1) is in list (all other arguments)"
+
+  local e
+  for e in "${@:2}"; do
+    [[ "$e" == "$1" ]] && return 0
+  done
+  return 1
+}
+
+fn-is-release() {
+  declare desc="Checks if a given run is a release run"
+  declare RELEASE="$1"
+  local IS_RELEASE=false
+  if [[ "$RELEASE" == "major" ]] || [[ "$RELEASE" == "minor" ]] || [[ "$RELEASE" == "patch" ]]; then
+    IS_RELEASE=true
+  fi
+
+  echo "$IS_RELEASE"
+}
+
+fn-require-bin() {
+  declare desc="Checks that a binary exists"
+  declare BINARY="$1"
+  if ! command -v "$BINARY" &>/dev/null; then
+    log-fail "Missing ${BINARY}, please install it"
+  fi
+}
+
+main() {
+  declare RELEASE="$1"
+  local NEXT_VERSION
+  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
+
+  if [[ "$RELEASE" == '--trace' ]]; then
+    shift 1
+    RELEASE="$1"
+    TRACE=1 && set -x
+  fi
+
+  if [[ -z "$RELEASE" ]]; then
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given"
+  fi
+
+  if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given"
+  fi
+
+  fn-require-bin "docker"
+  fn-require-bin "package_cloud"
+  [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
+
+  NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
+
+  fn-build-dokku || log-fail "Error building package"
+
+  fn-extract-package "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
+  fn-extract-package "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  fn-publish-package "$IS_RELEASE" "deb" "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+  fn-publish-package "$IS_RELEASE" "rpm" "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+}
+
+main "$@"

deb.mk

@@ -1,6 +1,6 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.34
+HEROKUISH_VERSION ?= 0.4.3
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
@@ -70,7 +70,7 @@ install-from-deb:
 
 	@echo "--> Installing dokku"
 	wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
-	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2> /dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq > /dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku
 
@@ -93,21 +93,23 @@ 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 BUILDARGS="--build-arg http_proxy=$$http_proxy"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${https_proxy+x} ]]; then BUILDARGS="$$BUILDARGS --build-arg https_proxy=$$https_proxy"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo Adding proxy settings to docker build: $$BUILDARGS; fi' >> /tmp/tmp/post-install
-	@echo 'sudo docker build --pull $$BUILDARGS -t gliderlabs/herokuish /var/lib/herokuish' >> /tmp/tmp/post-install
-
-	@echo "-> Cloning repository"
-	git clone -q "https://github.com/$(HEROKUISH_REPO_NAME).git" --branch "v$(HEROKUISH_VERSION)" /tmp/tmp/herokuish > /dev/null
-	rm -rf /tmp/tmp/herokuish/.git /tmp/tmp/herokuish/.gitignore
-
-	@echo "-> Copying files into place"
-	mkdir -p "/tmp/build/var/lib"
-	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish
+	@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 "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)"
-	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
+	sudo fpm -t deb -s dir -C /tmp/build -n herokuish \
+		-v $(HEROKUISH_VERSION) \
+		-a $(HEROKUISH_ARCHITECTURE) \
+		-p $(HEROKUISH_PACKAGE_NAME) \
+		--deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' \
+		--deb-pre-depends sudo \
+		--after-install /tmp/tmp/post-install \
+		--url "https://github.com/$(HEROKUISH_REPO_NAME)" \
+		--description $(HEROKUISH_DESCRIPTION) \
+		--license 'MIT License' \
+		.
 	mv *.deb /tmp
 
 deb-dokku:
@@ -115,6 +117,7 @@ deb-dokku:
 	mkdir -p /tmp/tmp /tmp/build
 
 	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
@@ -124,6 +127,7 @@ deb-dokku:
 
 	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

debian/control

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

debian/postinst

@@ -6,6 +6,11 @@ if [[ -e /usr/share/debconf/confmodule ]]; then
   . /usr/share/debconf/confmodule
 fi
 
+if [[ -r /etc/default/dokku ]]; then
+  # shellcheck disable=SC1091
+  source /etc/default/dokku
+fi
+
 readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
 readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
 

debian/preinst

@@ -26,7 +26,17 @@ case "$1" in
       } >> $NGINX_CONF
 
       rm -f /etc/nginx/sites-enabled/*
-      service nginx reload || /etc/init.d/nginx reload
+      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
     fi
 

docs/advanced-usage/event-logs.md

@@ -36,10 +36,8 @@ Jul  3 16:10:02 dokku.me dokku[128114]: INVOKED: docker-args-run( nhl )
 Jul  3 16:10:03 dokku.me dokku[128136]: INVOKED: post-release-buildpack( pythonapp )
 Jul  3 16:10:03 dokku.me dokku[128195]: INVOKED: pre-deploy( pythonapp )
 Jul  3 16:10:23 dokku.me dokku[129253]: INVOKED: docker-args-deploy( pythonapp )
-Jul  3 16:10:24 dokku.me dokku[129337]: INVOKED: bind-external-ip( pythonapp )
 Jul  3 16:10:24 dokku.me dokku[129451]: INVOKED: check-deploy( pythonapp 6274ced0d4be11af4490cd18abaf77cdd593f025133f403d984e80d86a39acec web 5000 10.0.16.80 )
 Jul  3 16:10:35 dokku.me dokku[129561]: INVOKED: docker-args-deploy( pythonapp )
-Jul  3 16:10:35 dokku.me dokku[129649]: INVOKED: bind-external-ip( pythonapp )
 Jul  3 16:10:36 dokku.me dokku[129760]: INVOKED: check-deploy( pythonapp ac88a56ee4161ff37e4b92d1498c3eadc91f0aa7c8b81b44fc077e2a51d54cc0 worker )
 Jul  3 16:10:46 dokku.me dokku[129851]: INVOKED: post-deploy( pythonapp )
 Jul  3 16:10:46 dokku.me dokku[129945]: INVOKED: nginx-pre-reload( pythonapp )
@@ -56,29 +54,28 @@ dokku events:list
 
 ```
 =====> Events currently logged
-docker-args-build
-pre-delete
-post-deploy
-receive-app
-pre-release-buildpack
-nginx-pre-reload
-docker-args-deploy
-post-build-buildpack
-post-domains-update
-post-release-dockerfile
 check-deploy
-git-pre-pull
-git-post-pull
-nginx-hostname
-bind-external-ip
-pre-deploy
-post-delete
 dependencies
-pre-build-buildpack
+docker-args-build
+docker-args-deploy
 docker-args-run
-pre-build-dockerfile
-post-release-buildpack
+git-post-pull
+git-pre-pull
+nginx-hostname
+nginx-pre-reload
+post-build-buildpack
 post-build-dockerfile
+post-delete
+post-deploy
+post-domains-update
+post-release-buildpack
+post-release-dockerfile
+pre-build-buildpack
+pre-build-dockerfile
+pre-delete
+pre-deploy
+pre-release-buildpack
 pre-release-dockerfile
+receive-app
 update
-```
+```

docs/advanced-usage/persistent-storage.md

@@ -43,7 +43,7 @@ Once you have mounted persistent storage, you will also need to restart the appl
 [process scaling documentation](/docs/deployment/process-management.md) for more information.
 
 ```shell
-dokku ps:rebuild app-name
+dokku ps:restart app-name
 ```
 
 A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container.

docs/advanced-usage/plugin-management.md

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

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

@@ -0,0 +1,32 @@
+# Docker Local Scheduler
+
+> New as of 0.12.0
+
+Dokku natively includes functionality to manage application lifecycles for a single server using the `scheduler-docker-local` plugin. It is the default scheduler, but as with all schedulers, it is set on a per-application basis. The scheduler can currently be overridden by running the following command:
+
+```shell
+dokku config:set node-js-app DOCKER_SCHEDULER=docker-local
+```
+
+As it is the default, unsetting the `DOCKER_SCHEDULER` config variable is also a valid way to reset the scheduler.
+
+```shell
+dokku config:unset node-js-app DOCKER_SCHEDULER
+```
+
+## Implemented Triggers
+
+This plugin implements various functionality through `plugn` triggers to integrate with Docker for running apps on a single server. The following functionality is supported by the `scheduler-docker-local` plugin.
+
+- `check-deploy`
+- `core-post-deploy`
+- `post-delete`
+- `pre-deploy`
+- `pre-restore`
+- `scheduler-deploy`
+- `scheduler-docker-cleanup`
+- `scheduler-logs-failed`
+- `scheduler-run`
+- `scheduler-stop`
+- `scheduler-tags-create`
+- `scheduler-tags-destroy`

docs/appendices/0.5.0-migration-guide.md

@@ -8,10 +8,10 @@
   - A detailed list of template variables can be found [here](/docs/configuration/nginx.md#available-template-variables)
 - A custom nginx-vhosts template must be named `nginx.conf.sigil`
   - The default path for this custom template is the root of your repo (i.e. `/app` in the container or `WORKDIR` if defined in a dockerfile app)
-  - Dokku no longer looks for this file in `/home/dokku/myapp` on the Dokku server
+  - Dokku no longer looks for this file in `/home/dokku/node-js-app` on the Dokku server
   - Check out an example template [here](/docs/configuration/nginx.md)
 - Support for server-wide SSL certs have been dropped in favor of using the `certs` plugin
-  - `dokku certs:add myapp < certs.tar`
+  - `dokku certs:add node-js-app < certs.tar`
 - All domains for an SSL-enabled app will be redirected to https by default
   - This can be overridden with a custom template
 - Replaced "magic" `NO_VHOST` variable with `domains:enable/disable`
@@ -22,4 +22,4 @@
 
 - Dockerfiles with `EXPOSE` clauses will get [all **tcp** ports proxied by default](/docs/deployment/methods/dockerfiles.md#exposed-ports)
   - Note that nginx will proxy the same port numbers to listen publicly
-  - UDP ports can be exposed by disabling the [nginx proxy](/docs/advanced-usage/proxy-management.md) with `dokku proxy:disable myapp`
+  - UDP ports can be exposed by disabling the [nginx proxy](/docs/advanced-usage/proxy-management.md) with `dokku proxy:disable node-js-app`

docs/assets/favicons/browserconfig.xml

@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.11/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.11.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.11.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.11.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.11.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.11.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.11.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.11\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"

docs/assets/style.css

@@ -1,5 +1,6 @@
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 62.5%; 
   font-weight: 400;
   padding-bottom: 40px;
   color: #5a5a5a;
@@ -19,7 +20,7 @@ h1 {
 }
 .header .heading {
   color: #fff;
-  font-size: 23px;
+  font-size: 2.4em;
   margin: 7px 0 0 0;
   padding: 0 0 0 1em;
 }
@@ -34,28 +35,37 @@ h1 {
   background-size: contain;
   background-repeat: no-repeat;
 }
+.header .nav-item a {
+  font-size: 1.6em;
+}
 .header .navbar-brand a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
+.blurb h2 {
+  font-size: 3.5em;
+}
 .blurb p {
-  font-size: 17px;
+  font-size: 1.9em;
   font-weight: 300;
   margin: 18px 0;
   text-align: center;
 }
+.blurb .btn-lg {
+  font-size: 2.2em;
+}
 .quickstart-code {
   display: block;
   line-height: 1.3em;
   margin: 45px auto;
-  max-width: 750px;
+  max-width: 860px;
   padding: 0;
 }
 .quickstart-code .title {
@@ -65,6 +75,7 @@ h1 {
   box-shadow: 0 3px 0 rgba(0, 0, 0, 0.5);
   color: #444;
   display: block;
+  font-size: 1.6em;
   font-weight: 400;
   margin: 0 20px;
   padding: 3px 0;
@@ -103,6 +114,7 @@ h1 {
   border-top: 1px solid #bcbcbc;
   box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
   display: none;
+  font-size: 1.4em;
   font-family: Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace;
   margin: 0 20px;
   padding: 20px;
@@ -136,9 +148,10 @@ h1 {
 }
 .alternate-instructions {
   display: block;
+  font-size: 1.6em;
   line-height: 1.3em;
   margin: 45px auto;
-  max-width: 750px;
+  max-width: 860px;
   padding: 0;
   text-align: center;
 }
@@ -166,7 +179,7 @@ h1 {
 }
 .slack-channel {
   background-color: #EEF1F7;
-  font-size: 16px;
+  font-size: 1.6em;
   font-weight: 300;
   margin-bottom: 2.5em;
   padding-top: 2.5em;
@@ -199,7 +212,7 @@ h1 {
 }
 .team-members .fund-link {
   display: block;
-  font-size: 80%;
+  font-size: .8em;
 }
 .team-member {
   min-height: 320px;
@@ -210,7 +223,7 @@ h1 {
 
 .list-group-item {
   border: none;
-  font-size: 14px;
+  font-size: 1.1em;
   font-weight: normal;
   padding: .2rem .5rem;
   color: #157577;
@@ -231,7 +244,7 @@ a.list-group-item {
   text-transform: uppercase;
 }
 .table-of-contents {
-  font-size: 0.8em;
+  font-size: 1.2em;
   padding: 1em;
   margin: 0 0 0.5em 0.5em;
 }
@@ -246,6 +259,7 @@ a.list-group-item {
   -webkit-font-smoothing: antialiased;
   box-sizing: border-box;
   color: rgb(71, 74, 84);
+  font-size: 1.6em;
   font-weight: normal;
   height: 20px;
   line-height: 1.5;
@@ -254,26 +268,26 @@ a.list-group-item {
 .markdown-body h1 {
   border-bottom: 1px solid #dfdfdf;
   color: #444;
-  font-size: 24px;
+  font-size: 1.6em;
   padding-bottom: 1em;
   margin-top: 0;
   text-rendering: optimizelegibility;
 }
 .markdown-body h2 {
-  font-size: 17px;
+  font-size: 1.3em;
   font-weight: 700;
   color: #555;
   margin-top: 2em;
   text-transform: uppercase;
 }
 .markdown-body h3 {
-  font-size: 15px;
+  font-size: 1.2em;
   font-weight: 700;
   color: #555;
   margin: 1em 0;
 }
 .markdown-body h4 {
-  font-size: 14px;
+  font-size: 1.1em;
   font-weight: 700;
   color: #555;
   margin: 1em 0;
@@ -295,7 +309,7 @@ a.list-group-item {
   right: 0;
   width: auto;
   height: auto;
-  font-size: 0.9em;
+  font-size: 1.2em;
   border-radius: 0 0 0 5px;
   padding: 0 0.5em;
   text-shadow: none;
@@ -319,7 +333,6 @@ code {
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   margin: 0;
-  font-size: 85%;
   background-color: #fff;
   background-color: rgba(0, 0, 0, 0.06);
   color: #333;
@@ -367,6 +380,11 @@ blockquote {
   border-left: 4px solid #ef5b58;
   background-color: #f9ad76;
 }
+.warning {
+  border-left: 4px solid #cd2512;
+  background-color: #d1675f;
+  color: white;
+}
 .fa:before {
   -webkit-font-smoothing: antialiased
 }
@@ -415,10 +433,9 @@ blockquote {
   font-weight: 700;
   text-transform: uppercase;
   margin: 0;
-  font-size: 14px;
+  font-size: 1.3em;
 }
 .git-improve {
-  font-size: 20px;
   vertical-align: -2px;
   padding-left: 8px;
 }
@@ -433,7 +450,6 @@ blockquote {
 .icon-improve {
   color: #bdbdb5;
   padding: 2px 9px 0 10px;
-  font-size: 14px;
 }
 a .fa {
   display: inline-block;
@@ -584,7 +600,7 @@ ul.fas li .fa-large:before, ul.fas li .fa-large:before {
   background-image: -ms-linear-gradient(-45deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
   background-image: linear-gradient(135deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
   font-family: "Roboto", Corbel, Avenir, "Lucida Grande", "Lucida Sans", sans-serif;
-  font-size: 14px;
+  font-size: 1.6em;
   text-align: center;
   background-color: #ffe761;
 }
@@ -610,14 +626,11 @@ ul.fas li .fa-large:before, ul.fas li .fa-large:before {
   .col-md-offset-right-2 {
     margin-right: 20.666667%;
   }
-  .quickstart-code shell {
-    font-size: 14px;
-  }
   .quickstart-code {
     line-height: 22px;
   }
   .featurette-heading {
-    font-size: 50px;
+    font-size: 5em;
   }
 }
 @media (min-width: 992px) {

docs/assets/versions.json

@@ -8,6 +8,7 @@
     "0.8.2", 
     "0.9.4", 
     "0.10.5", 
-    "0.11.4"
+    "0.11.6", 
+    "0.12.11"
   ]
 }

docs/community/plugins.md

@@ -44,7 +44,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 
 ## Community plugins
 
-Note: The following plugins have been supplied by our community and may not have been tested by Dokku maintainers.
+> Warning: The following plugins have been supplied by our community and may not have been tested by Dokku maintainers.
 
 [256dpi]: https://github.com/256dpi
 [abossard]: https://github.com/dudagroup
@@ -125,6 +125,7 @@ Note: The following plugins have been supplied by our community and may not have
 [wmluke]: https://github.com/wmluke
 [Zenedith]: https://github.com/Zenedith
 [fteychene]: https://github.com/fteychene
+[sarendsen]: https://github.com/sarendsen
 
 ### Datastores
 
@@ -180,7 +181,6 @@ Note: The following plugins have been supplied by our community and may not have
 | [Dockerfile custom path](https://github.com/mimischi/dokku-dockerfile)                            | [mimischi][]          | 0.8.0+                |
 | [Dokku Registry](https://github.com/agco-adm/dokku-registry)<sup>1</sup>                          | [agco-adm][]          | 0.4.0+                |
 | [Dokku Require](https://github.com/crisward/dokku-require)<sup>2</sup>                            | [crisward][]          | 0.4.0+                |
-| [git rev-parse HEAD in env](https://github.com/dokku-community/dokku-git-rev)                     | [cjblomqvist][]       | 0.4.0+                |
 | [Global Certificates](https://github.com/josegonzalez/dokku-global-cert)                          | [josegonzalez][]      | 0.5.0+                |
 | [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.4.0+                |
 | [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
@@ -219,6 +219,7 @@ Note: The following plugins have been supplied by our community and may not have
 | [Chef cookbook](https://github.com/nickcharlton/dokku-cookbook)                                   | [nickcharlton][]      |                       |
 | [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                 | [Flink][]             | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
+| [Limit (Resource management)](https://github.com/sarendsen/dokku-limit)                           | [sarendsen][]         | 0.9.0+                |
 | [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.4.0+                |
 | [Syslog](https://github.com/michaelshobbs/dokku-syslog)                                           | [michaelshobbs][]     | 0.10.4+               |
 | [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+                |
@@ -248,6 +249,7 @@ The following plugins have been removed as their functionality is now in Dokku C
 | [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin)           |
 | [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | v0.4.2 (named containers plugin)          |
 | [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)                   |
+| [git rev-parse HEAD in env](https://github.com/dokku-community/dokku-git-rev)                     | [cjblomqvist][]       | v0.12.0 (enhanced core git plugin)        |
 | [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin)           |
 | [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin)           |
 | [List Containers](https://github.com/josegonzalez/dokku-list)                                     | [josegonzalez][]      | v0.3.14 (ps plugin)                       |

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

@@ -0,0 +1,106 @@
+# Deploying with Gitlab CI
+
+Gitlab-CI can be used to automatically deploy a Dokku application using the [ilyasemenov/gitlab-ci-git-push image](https://github.com/IlyaSemenov/gitlab-ci-git-push) docker image.
+
+## Prerequisites
+
+Make sure you have a Gitlab account and a Dokku project hosted on Gitlab. This method works whether if you are using buildpacks or Dockerfile.
+
+Make sure you have set up an app on the remote machine following [these instructions](http://dokku.viewdocs.io/dokku/deployment/application-deployment/) and can successfully deploy to it from the local machine.
+
+## Deploy automatically to production
+
+### Add a secret variable
+
+Browse to the repository in question and visit the following path: `the Gitlab project > Settings > CI/CD.`
+
+Click on `Secret variables > Expand` and fill in the blanks.
+
+- Key: `SSH_PRIVATE_KEY`
+- Value: paste in an SSH private key registered in Dokku:
+
+    -----BEGIN RSA PRIVATE KEY-----
+    ...
+    -----END RSA PRIVATE KEY-----
+
+- Environment scope: `production` (This make sure that `SSH_PRIVATE_KEY` is not available on merge requests or tests)
+- Protected: Do not check this checkbox unless you know what you are doing
+
+### Add CI script
+
+Create a file named `.gitlab-ci.yml` at the root directory of the repository with the following contents:
+
+```yaml
+stages:
+  - deploy
+
+variables:
+  APP_NAME: node-js-app
+
+deploy:
+  image: ilyasemenov/gitlab-ci-git-push
+  stage: deploy
+  environment:
+    name: production
+    url: https://$APP_NAME.dokku.me/
+  only:
+    - master
+  script:
+    - git-push ssh://dokku@dokku.me:22/$APP_NAME
+```
+
+You will need to modify the `APP_NAME` variable to the correct value for your application name.
+
+Running `git push origin master` will now trigger a gitlab-ci pipeline that will automatically deploy your application to your Dokku server. Go to your project on Gitlab and visit "Project > Pipelines" to see the deployment log.
+
+
+## Review Applications
+
+One useful feature of gitlab is to be able to create review applications for non-production branches. This allows teams to review changes _before_ they are pushed to production. First, recreate the `SSH_PRIVATE_KEY` secret - do not delete the existing secret - but scoped to the `review/*` environment. This will allow non-production gitlab environments access to the secret.
+
+Next, we'll need to create the `review_app` gitlab job in our `.gitlab-ci.yaml`.
+
+```yaml
+review_app:
+  image: ilyasemenov/gitlab-ci-git-push
+  stage: deploy
+  environment:
+    name: review/$CI_ENVIRONMENT_SLUG
+    url: https://$CI_ENVIRONMENT_SLUG.dokku.me/
+    on_stop: stop_review_app
+  only:
+    - branches
+  except:
+    - master
+  script:
+    - mkdir -p ~/.ssh && echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+    - ssh-keyscan -H 22 "dokku.me" >> ~/.ssh/known_hosts
+    - ssh -t dokku@dokku.me -- apps:clone --ignore-existing --skip-deploy "$APP_NAME" "$CI_ENVIRONMENT_SLUG"
+    - git-push ssh://dokku@dokku.me:22/$CI_ENVIRONMENT_SLUG
+```
+
+The first two lines ensure that Gitlab can talk to the Dokku server. Next, we take advantage of the `apps:clone` command, and clone the existing application and all of it's configuration to a new location. If the new application already exists, the third line of the `script` step will be ignored. We also ignore the first deploy script to speed up the cloning process. Finally, the fourth line of the `script` step will deploy the code as normal.
+
+The above only runs for non-master branches, and will _also_ trigger an `on_stop` job called `stop_review_app`. When the branch is deleted or the code is merged, the `stop_review_app` job will be triggered.
+
+```yaml
+stop_review_app:
+  image: ilyasemenov/gitlab-ci-git-push
+  stage: deploy
+  environment:
+    name: review/$CI_ENVIRONMENT_SLUG
+    action: stop
+  when: manual
+  script:
+    - mkdir -p ~/.ssh && echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+    - ssh-keyscan -H 22 "dokku.me" >> ~/.ssh/known_hosts
+    - ssh -t dokku@dokku.me -- --force apps:destroy "$CI_ENVIRONMENT_SLUG"
+```
+
+The `stop_review_app` step will delete the temporary application, cleaning up now unused server resources.
+
+Going further, the following modifications can be done:
+
+- Notify via chat whenever a review application is created/destroyed.
+- Push to a separate, staging server as opposed to a production server.
+- Clone a "staging" application so that review applications do not affect production datasets.

docs/community/tutorials/run-on-external-volume.md

@@ -0,0 +1,78 @@
+# Run Dokku on External Volume
+
+In order to leverage cloud-provider facilities like _attachable volumes_, (_a.k.a. block storage_)
+the following is an easy tutorial to achieve Dokku runs on them.
+
+> Warning: If the block storage is not available and attached on boot it is possible that containers will not correctly start. Please keep this in mind when considering moving Dokku and/or Docker to network attached storage.
+
+## Tutorial
+
+The following is intended to be executed on the dokku host machine as `root`.
+Say, _for instance_, that our volume is mapped into the systems as `/dev/vdb1`.
+
+Stop docker daemon
+
+```shell
+systemctl stop docker
+```
+
+Prepare the filesystem:
+
+```shell
+mkfs -t ext4 /dev/vdb1
+mkdir /mnt/volume
+mount /dev/vdb1 /mnt/volume
+```
+
+Move the old data directories:
+
+```shell
+mv /home/dokku /home/dokku.OLD
+mv /var/lib/docker /var/lib/docker.OLD
+mv /var/lib/dokku /var/lib/dokku.OLD
+```
+
+Move the data on the volume
+
+```shell
+mkdir /mnt/volume/home/
+mkdir /mnt/volume/var/lib/
+mv /home/dokku.OLD /mnt/volume/home/dokku
+mv /var/lib/dokku.OLD /mnt/volume/var/lib/dokku
+mv /var/lib/docker.OLD /mnt/volume/var/lib/docker
+```
+
+Prepare the mountpoints
+
+```shell
+mkdir /home/dokku
+mkdir /var/lib/dokku
+mkdir /var/lib/docker
+chown dokku:dokku /home/dokku   # respect the original ownership
+chmod 711 /var/lib/docker       # respect the original permissions
+```
+
+Mount bind
+
+```shell
+mount -o bind /mnt/volume/home/dokku /home/dokku
+mount -o bind /mnt/volume/var/lib/dokku /var/lib/dokku
+mount -o bind /mnt/volume/var/lib/docker /var/lib/docker
+```
+
+Start docker daemon
+
+```shell
+systemctl start docker
+```
+
+At this point all should be working fine, please check it out.
+
+Then, let the changes be reboot-persistent
+
+```shell
+echo '/dev/vdb1 /mnt/volume ext4 defaults 0 2' | sudo tee -a /etc/fstab
+echo '/mnt/volume/home/dokku /home/dokku none defaults,bind 0 0' | sudo tee -a /etc/fstab
+echo '/mnt/volume/var/lib/dokku /var/lib/dokku none defaults,bind 0 0' | sudo tee -a /etc/fstab
+echo '/mnt/volume/var/lib/docker /var/lib/docker none defaults,bind 0 0' | sudo tee -a /etc/fstab
+```

docs/configuration/domains.md

@@ -15,7 +15,7 @@ domains:set <app> <domain> [<domain> ...]      # Set domains for app
 domains:set-global <domain> [<domain> ...]     # Set global domain names
 ```
 
-> Adding a domain before deploying an application will result in port mappings being set. This may cause issues for applications that use non-standard ports, as those will not be automatically detected. Please refer to the [proxy documentation](/docs/advanced-usage/proxy-management.md) for information as to how to reconfigure the mappings.
+> Adding a domain before deploying an application will result in port mappings being set. This may cause issues for applications that use non-standard ports, as those will not be automatically detected. Please refer to the [proxy documentation](/docs/networking/proxy-management.md) for information as to how to reconfigure the mappings.
 
 ## Customizing hostnames
 
@@ -48,31 +48,31 @@ If the `nginx-hostname` plugin has no output, the normal hostname algorithm will
 If desired, it is possible to disable vhosts with the domains plugin.
 
 ```shell
-dokku domains:disable myapp
+dokku domains:disable node-js-app
 ```
 
-On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_NGINX_PORT` and/or `DOKKU_NGINX_SSL_PORT` (for services configured to use SSL.)
+On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_PROXY_PORT` and/or `DOKKU_PROXY_SSL_PORT` (for services configured to use SSL.)
 
 
 The domains plugin allows you to specify custom domains for applications. This plugin is aware of any ssl certificates that are imported via `certs:add`. Be aware that disabling domains (with `domains:disable`) will override any custom domains.
 
 ```shell
-# where `myapp` is the name of your app
+# where `node-js-app` is the name of your app
 
 # add a domain to an app
-dokku domains:add myapp example.com
+dokku domains:add node-js-app dokku.me
 
 # list custom domains for app
-dokku domains myapp
+dokku domains node-js-app
 
 # clear all custom domains for app
-dokku domains:clear myapp
+dokku domains:clear node-js-app
 
 # remove a custom domain from app
-dokku domains:remove myapp example.com
+dokku domains:remove node-js-app dokku.me
 
 # set all custom domains for app
-dokku domains:set myapp example.com example.org
+dokku domains:set node-js-app dokku.me dokku.org
 ```
 
 ## Displaying domains reports about an app
@@ -88,19 +88,19 @@ dokku domains:report
 ```
 =====> node-js-app domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.example.org
+       Domains app vhosts:  ruby-sample.dokku.org
        Domains global enabled: true
-       Domains global vhosts: example.org
+       Domains global vhosts: dokku.org
 =====> python-sample domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.example.org
+       Domains app vhosts:  ruby-sample.dokku.org
        Domains global enabled: true
-       Domains global vhosts: example.org
+       Domains global vhosts: dokku.org
 =====> ruby-sample domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.example.org
+       Domains app vhosts:  ruby-sample.dokku.org
        Domains global enabled: true
-       Domains global vhosts: example.org
+       Domains global vhosts: dokku.org
 ```
 
 You can run the command for a specific app also.
@@ -112,9 +112,9 @@ dokku domains:report node-js-app
 ```
 =====> node-js-app domains information
        Domains app enabled: true
-       Domains app vhosts:  node-js-app.example.org
+       Domains app vhosts:  node-js-app.dokku.org
        Domains global enabled: true
-       Domains global vhosts: example.org
+       Domains global vhosts: dokku.org
 ```
 
 You can pass flags which will output only the value of the specific information you want. For example:
@@ -131,13 +131,29 @@ Create the file at `/etc/nginx/conf.d/00-default-vhost.conf`:
 
 ```nginx
 server {
-  listen 80 default_server;
-  listen [::]:80 default_server;
-
-  server_name _;
-  return 410;
-  log_not_found off;
+    listen 80 default_server;
+    server_name _;
+    access_log off;
+    return 410;
 }
+
+# To handle HTTPS requests, you can uncomment the following section.
+#
+# Please note that in order to let this work as expected, you need a valid
+# SSL certificate for any domains being served. Browsers will show SSL
+# errors in all other cases.
+#
+# Note that the key and certificate files in the below example need to
+# be copied into /etc/nginx/ssl/ folder.
+#
+# server {
+#     listen 443 ssl;
+#     server_name _;
+#     ssl_certificate /etc/nginx/ssl/cert.crt;
+#     ssl_certificate_key /etc/nginx/ssl/cert.key;
+#     access_log off;
+#     return 410;
+# }
 ```
 
 Make sure to reload nginx after creating this file by running `service nginx reload`.

docs/configuration/environment-variables.md

@@ -5,14 +5,17 @@ Typically an application will require some configuration to run properly. Dokku
 The `config` plugin provides the following commands to manage your variables:
 
 ```
-config (<app>|--global)                                     Display all global or app-specific config vars
-config:get (<app>|--global) KEY                             Display a global or app-specific config value
-config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]   Set one or more config vars
-config:unset (<app>|--global) KEY1 [KEY2 ...]               Unset one or more config vars
-config:export [--format=FORMAT] [--merged] (<app>|--global) Export all global or app-specific configuration
+config (<app>|--global)                                                               Pretty-print an app or global environment
+config:get (<app>|--global) KEY                                                       Display a global or app-specific config value
+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).
 
-The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
+Environment variables are available both at run time and during the application build/compilation step for buildpack-based deploys.
 
 For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
 
@@ -92,6 +95,7 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_TRACE`                  | none                            | `dokku trace on`   <br /> `dokku trace false` <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. |
 | `DOKKU_APP_TYPE`               | `herokuish`                     |  Auto-detected by using buildpacks or dockerfile                                                                                                 | |
 | `DOKKU_CHECKS_DISABLED`        | none                            | `dokku checks:disable`                                                                                                                           | |
 | `DOKKU_CHECKS_ENABLED`         | none                            | `dokku checks:enable`                                                                                                                            | |
@@ -100,16 +104,17 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_CHECKS_TIMEOUT`         | `30`                            | `dokku config:set`                                                                                                                               | Wait this many seconds for each response before marking it as a failure.
 | `DOKKU_CHECKS_ATTEMPTS`        | `5`                             | `dokku config:set`                                                                                                                               | Number of retries for to run for a specific check before marking it as a failure
 | `DOKKU_DEFAULT_CHECKS_WAIT`    | `10`                            | `dokku config:set`                                                                                                                               | 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_DEPLOY_BRANCH`          | `master`                        | `dokku config:set`                                                                                                                               | Branch to deploy by default. |
 | `DOKKU_DISABLE_PROXY`          | none                            | `dokku proxy:disable` <br /> `dokku proxy:enable`                                                                                                | Disables the proxy in front of your application, resulting in publicly routing the docker container. |
+| `DOKKU_DISABLE_ANSI_PREFIX_REMOVAL` | none                       | `dokku config:set` <br /> `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                 | Disables removal of the ANSI prefix during deploys. Can be used in cases where the client deployer does not understand ansi escape  codes. |
+| `DOKKU_DISABLE_APP_AUTOCREATION` | none                            | `dokku config:set`                                                                                                                               | Disables automatic creation of a non-existent app on deploy. |
 | `DOKKU_DOCKER_STOP_TIMEOUT`    | `10`                            | `dokku config:set`                                                                                                                               | 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_DOCKERFILE_CMD`         | dockerfile cmd                  | `dokku config:set`                                                                                                                               | |
 | `DOKKU_DOCKERFILE_CACHE_BUILD` | none                            | `dokku config:set`                                                                                                                               | |
 | `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_NGINX_PORT`             | automatically assigned          | `dokku config:set`                                                                                                                               | |
-| `DOKKU_NGINX_SSL_PORT`         | automatically assigned          | `dokku config:set`                                                                                                                               | |
+| `DOKKU_PROXY_PORT`             | automatically assigned          | `dokku config:set`                                                                                                                               | |
+| `DOKKU_PROXY_SSL_PORT`         | automatically assigned          | `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. |

docs/configuration/nginx.md

@@ -30,8 +30,8 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
 {{ .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
-{{ .NGINX_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_NGINX_PORT` config var)
-{{ .NGINX_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_NGINX_SSL_PORT` config var)
+{{ .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
 {{ .PROXY_PORT_MAP }}               List of port mappings (same as `DOKKU_PROXY_PORT_MAP` config var)
 {{ .PROXY_UPSTREAM_PORTS }}         List of configured upstream ports (derived from `DOKKU_PROXY_PORT_MAP` config var)
@@ -46,20 +46,20 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
 
 The default nginx.conf template will include everything from your apps `nginx.conf.d/` subdirectory in the main `server {}` block (see above):
 
-```go
+```
 include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
 ```
 
 That means you can put additional configuration in separate files, for example to limit the uploaded body size to 50 megabytes, do
 
 ```shell
-mkdir /home/dokku/myapp/nginx.conf.d/
-echo 'client_max_body_size 50m;' > /home/dokku/myapp/nginx.conf.d/upload.conf
-chown dokku:dokku /home/dokku/myapp/nginx.conf.d/upload.conf
+mkdir /home/dokku/node-js-app/nginx.conf.d/
+echo 'client_max_body_size 50m;' > /home/dokku/node-js-app/nginx.conf.d/upload.conf
+chown dokku:dokku /home/dokku/node-js-app/nginx.conf.d/upload.conf
 service nginx reload
 ```
 
-The example above uses additional configuration files directly on the Dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/myapp/nginx.conf.d/` directory manually.
+The example above uses additional configuration files directly on the Dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/node-js-app/nginx.conf.d/` directory manually.
 
 For PHP Buildpack users, you will also need to provide a `Procfile` and an accompanying `nginx.conf` file to customize the nginx config *within* the container. The following are example contents for your `Procfile`
 

docs/configuration/ssl.md

@@ -97,11 +97,11 @@ dokku certs:report node-js-sample
 =====> node-js-sample ssl information
        Ssl dir:             /home/dokku/node-js-sample/tls
        Ssl enabled:         true
-       Ssl hostnames:       *.example.org example.org
+       Ssl hostnames:       *.dokku.org dokku.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=*.example.org
+       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.dokku.org
        Ssl verified:        self signed.
 ```
 
@@ -129,8 +129,8 @@ If your server runs behind an HTTP/S load balancer, then Nginx will see all requ
 
 ```go
 server {
-  listen      [::]:{{ .NGINX_PORT }};
-  listen      {{ .NGINX_PORT }};
+  listen      [::]:{{ .PROXY_PORT }};
+  listen      {{ .PROXY_PORT }};
   server_name {{ .NOSSL_SERVER_NAME }};
   access_log  /var/log/nginx/{{ .APP }}-access.log;
   error_log   /var/log/nginx/{{ .APP }}-error.log;

docs/deployment/application-deployment.md

@@ -15,7 +15,7 @@ git clone git@github.com:heroku/ruby-rails-sample.git
 Create the application on the Dokku host. You will need to ssh onto the host to run this command.
 
 ```shell
-# on your Dokku host
+# on the Dokku host
 dokku apps:create ruby-rails-sample
 ```
 
@@ -24,7 +24,7 @@ dokku apps:create ruby-rails-sample
 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:
 
 ```shell
-# on your Dokku host
+# on the Dokku host
 # install the postgres plugin
 # plugin installation requires root, hence the user change
 sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
@@ -40,7 +40,7 @@ dokku postgres:create rails-database
 Once the service creation is complete, set the `POSTGRES_URL` environment variable by linking the service.
 
 ```shell
-# on your Dokku host
+# 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
 ```
@@ -93,30 +93,12 @@ When the deploy finishes, the application's URL will be shown as seen 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/).
 
 
-### Deploying non-master branch
-
-Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku <local branch>:master```
-
-An alternative is to use the `DOKKU_DEPLOY_BRANCH` application config value to specify a branch that should be deployed. The implicit default is master, and this can be modified both at the app and global level:
-
-```shell
-# on your Dokku host
-
-# set it globally
-dokku config:set --global DOKKU_DEPLOY_BRANCH=some-branch
-
-# override for a specific app
-dokku config:set ruby-rails-sample DOKKU_DEPLOY_BRANCH=some-branch
-```
-
-You can also support pushing multiple branches using the [receive-branch](/docs/development/plugin-triggers.md#receive-branch) plugin trigger in a custom plugin.
-
 ### Skipping deployment
 
 If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running:
 
 ``` shell
-# on your Dokku host
+# on the Dokku host
 dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
 ```
 
@@ -125,7 +107,7 @@ dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
 If you need to re-deploy (or restart) your app: 
 
 ```shell
-# on your Dokku host
+# on the Dokku host
 dokku ps:rebuild ruby-rails-sample
 ```
 
@@ -136,7 +118,7 @@ See the [process scaling documentation](/docs/deployment/process-management.md)
 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.
 
 ```shell
-# on your Dokku host
+# on the Dokku host
 su - dokku
 ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 ssh -T git@github.com
@@ -202,23 +184,27 @@ See the [user management documentation](/docs/deployment/user-management.md).
 
 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).
+
 ## Dockerfile deployment
 
 See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md).
 
-## Specifying a custom buildpack
-
-See the [buildpack documentation](/docs/deployment/methods/buildpacks.md).
-
 ## Image tagging
 
 See the [image tagging documentation](/docs/deployment/methods/images.md).
 
+## Specifying a custom buildpack
+
+See the [buildpack documentation](/docs/deployment/methods/buildpacks.md).
+
 ## Removing a deployed app
 
 See the [application management documentation](/docs/deployment/application-management.md#removing-a-deployed-app).
 
-### Renaming a deployed app
+## Renaming a deployed app
 
 See the [application management documentation](/docs/deployment/application-management.md#renaming-a-deployed-app).
 

docs/deployment/application-management.md

@@ -6,9 +6,12 @@
 apps:clone <old-app> <new-app>                 # Clones an app
 apps:create <app>                              # Create a new app
 apps:destroy <app>                             # Permanently destroy an app
+apps:exists <app>                              # Checks if an app exists
 apps:list                                      # List your apps
+apps:lock                                      # Creates a '.deploy.lock' file in an application's repo
 apps:rename <old-app> <new-app>                # Rename an app
 apps:report [<app>] [<flag>]                   # Display report about an app
+apps:unlock                                    # Removes the '.deploy.lock' file from an application's repo
 ```
 
 ## Usage
@@ -40,6 +43,20 @@ node-js-app
 python-app
 ```
 
+### Checking if an application exists
+
+For CI/CD pipelines, it may be useful to see if an application exists before creating a "review" application for a specific branch. You can do so via the `apps:exists` command:
+
+```shell
+dokku apps:exists  node-js-app
+```
+
+```
+App does not exist
+```
+
+The `apps:exists` command will return non-zero if the application does not exist, and zero if it does.
+
 ### Manually creating an application
 
 A common pattern for deploying applications to Dokku is to configure an application before deploying it. You can do so via the `apps:create` command:
@@ -119,7 +136,7 @@ This will copy all of your app's contents into a new app directory with the name
 
 ### Cloning an existing app
 
-> New as of 0.8.1
+> New as of 0.11.5
 
 You can clone an existing app using the `apps:clone` command.  Note that the application *must* have been deployed at least once, or cloning will not complete successfully:
 
@@ -141,6 +158,45 @@ By default, Dokku will deploy this new application, though you can skip the depl
 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.
+
+```shell
+dokku apps:clone --ignore-existing node-js-app io-js-app
+```
+
+### Locking app deploys
+
+> New as of 0.11.6
+
+If you wish to disable deploying for a period of time, this can be done via deploy locks. Normally, deploy locks exist only for the duration of a deploy so as to avoid deploys from colliding, but a deploy lock can be created by running the `apps:lock` command.
+
+
+```shell
+dokku apps:lock node-js-app
+```
+
+```
+-----> Deploy lock created
+```
+
+### Unlocking app deploys
+
+> New as of 0.11.6
+
+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.
+
+```shell
+dokku apps:unlock node-js-app
+```
+
+```
+ !     A deploy may be in progress.
+ !     Removing the application lock will not stop in progress deploys.
+-----> Deploy lock removed.
+```
+
 ### Displaying reports about an app
 
 > New as of 0.8.1
@@ -154,16 +210,16 @@ dokku apps:report
 ```
 =====> node-js-app
        App dir:             /home/dokku/node-js-app
-       Git sha:             dbddc3f                  
-       App cid:             7b18489c98be             
-       Status:              running                  
+       Git sha:             dbddc3f
+       Deploy source:       git
+       Locked:              false
 =====> python-sample
 not deployed
 =====> ruby-sample
        App dir:             /home/dokku/ruby-sample
        Git sha:             a2d477c
-       App cid:             78a44d71012a
-       Status:              running
+       Deploy source:       git
+       Locked:              false
 ```
 
 You can run the command for a specific app also.
@@ -175,9 +231,9 @@ dokku apps:report node-js-app
 ```
 =====> node-js-app
        App dir:             /home/dokku/node-js-app
-       Git sha:             dbddc3f                  
-       App cid:             7b18489c98be             
-       Status:              running   
+       Git sha:             dbddc3f
+       Deploy source:       git
+       Locked:              false
 ```
 
 You can pass flags which will output only the value of the specific information you want. For example:

docs/deployment/logs.md

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

docs/deployment/methods/buildpacks.md

@@ -7,6 +7,14 @@ Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.co
   - See the [environment variable documentation](/docs/configuration/environment-variables.md) for more details.
 - Create a `.buildpacks` file in the root of your repository.
 
+## Switching from Dockerfile deployments
+
+If an application was previously deployed via Dockerfile, the following commands should be run before a buildpack deploy will succeed:
+
+```shell
+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.
@@ -86,7 +94,7 @@ Certain buildpacks may time out in retrieving dependencies via curl. This can ha
 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=600
+dokku config:set --global CURL_TIMEOUT=1200
 dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
 

docs/deployment/methods/dockerfiles.md

@@ -11,9 +11,13 @@ To use a dockerfile for deployment, commit a valid `Dockerfile` to the root of y
 - 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).
 
-## Exposed ports
+## Switching from Buildpack deployments
 
-See the [port management documentation](/docs/networking/port-management.md).
+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
 
@@ -55,7 +59,6 @@ ENV NODE_ENV ${NODE_ENV}
 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`:
@@ -105,3 +108,7 @@ a worker container for this app, you can run `dokku ps:scale worker=1` and a new
 started by running `docker run bin/run-worker.sh` (the actual `docker run` commands are a bit more
 complex, but this is the basic idea). If you use an `ENTRYPOINT` in your `Dockerfile`, the lines
 in your `Procfile` will be passed as arguments to the `ENTRYPOINT` script instead of being executed.
+
+## Exposed ports
+
+See the [port management documentation](/docs/networking/port-management.md).

docs/deployment/methods/git.md

@@ -0,0 +1,78 @@
+# GIT Deployment
+
+> Subcommands new as of 0.12.0
+
+```
+git:initialize <app>                     # Initialize a git repository for an app
+git:report [<app>] [<flag>]              # Displays a git report for one or more apps
+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). 
+
+## Usage
+
+### 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:
+
+```shell
+# on the Dokku host
+
+# overrides any existing pre-receive hook
+dokku git:initialize node-js-app
+```
+
+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.
+
+### 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:
+
+```shell
+# on the local machine
+
+# where `SOME_BRANCH_NAME` is the name of the branch
+git push dokku SOME_BRANCH_NAME:master
+```
+
+In `0.12.0`, the correct way to change the deploy branch is to use the `git:set` Dokku command.
+
+```shell
+# on the Dokku host
+
+# override for all applications
+dokku git:set --global deploy-branch SOME_BRANCH_NAME
+
+# override for a specific app
+# where `SOME_BRANCH_NAME` is the name of the branch
+dokku git:set node-js-app deploy-branch SOME_BRANCH_NAME
+```
+
+Pushing multiple branches can also be supportec by creating a [receive-branch](/docs/development/plugin-triggers.md#receive-branch) plugin trigger in a custom plugin.
+
+### 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.
+
+To configure the name of the `GIT_REV` environment variable, run the `git:set` command as follows:
+
+```shell
+# on the Dokku host
+
+# override for a specific app
+dokku git:set node-js-app rev-env-var DOKKU_GIT_REV
+```
+
+This behavior can be disabled entirely on a per-app basis by setting the `rev-env-var` value to an empty string:
+
+```shell
+# on the Dokku host
+
+# override for a specific app
+dokku git:set node-js-app rev-env-var ""
+```

docs/deployment/one-off-processes.md

@@ -140,7 +140,7 @@ The following is a sample cronfile that you can use for your applications:
 
 ```cron
 # server cron jobs
-MAILTO="mail@example.com"
+MAILTO="mail@dokku.me"
 PATH=/usr/local/bin:/usr/bin:/bin
 SHELL=/bin/bash
 

docs/deployment/process-management.md

@@ -13,6 +13,7 @@ ps:restartall                                  # Restart all deployed app contai
 ps:scale <app> <proc>=<count> [<proc>=<count>] # Get/Set how many instances of a given process to run
 ps:set-restart-policy <app> <policy>           # Sets app restart-policy
 ps:start <app>                                 # Start app container(s)
+ps:startall                                    # Start all deployed app containers
 ps:stop <app>                                  # Stop app container(s)
 ps:stopall                                     # Stop all app container(s)
 ```
@@ -114,6 +115,16 @@ All stopped containers can be started using the `ps:start` command. This is simi
 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.
+
+Be aware that no action will be taken if the application containers are running.
+
+```shell
+dokku ps:startall
+```
+
 ## Restart Policies
 
 > New as of 0.7.0

docs/deployment/user-management.md

@@ -50,20 +50,13 @@ b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
 
 > `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.
 
-Admin users and root can also add keys remotely:
-
-```shell
-cat ~/.ssh/id_rsa.pub | ssh dokku@dokku.me ssh-keys:add KEY_NAME
-```
-
-If you are using an ssh user other than `dokku`, then you'll also need to specify the `dokku` bin:
+Admin users and root can add keys remotely by specifying the `dokku` bin on their `ssh` command:
 
 ```shell
 cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
 ```
 
-
-Finally, 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

docs/deployment/zero-downtime-deploys.md

@@ -145,15 +145,15 @@ The `CHECKS` file can contain multiple checks:
 To check an application that supports multiple hostnames, use relative URLs that include the hostname:
 
 ```
-//admin.example.com  Admin Dashboard
-//static.example.com/logo.png
+//admin.dokku.me  Admin Dashboard
+//static.dokku.me/logo.png
 ```
 
 You can also specify the protocol to explicitly check HTTPS requests:
 
 ```
-https://admin.example.com  Admin Dashboard
-https://static.example.com/logo.png
+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.
@@ -286,7 +286,7 @@ git push dokku master
 
 ```
 -----> Cleaning up...
------> Building myapp from herokuish...
+-----> Building node-js-app from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -296,8 +296,8 @@ git push dokku master
 
 -----> Discovering process types
        Procfile declares types -> web
------> Releasing myapp...
------> Deploying myapp...
+-----> Releasing node-js-app...
+-----> Deploying node-js-app...
 -----> Running pre-flight checks
 -----> Attempt 1/6 Waiting for 10 seconds ...
        CHECKS expected result:
@@ -315,7 +315,7 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
        CHECKS expected result:
        http://localhost/check.txt => "simple_check"
 -----> All checks successful!
-=====> myapp container output:
+=====> node-js-app container output:
        => Booting Thin
        => Rails 4.2.0 application starting in production on http://0.0.0.0:5000
        => Run `rails server -h` for more startup options
@@ -323,15 +323,15 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
        Thin web server (v1.6.3 codename Protein Powder)
        Maximum connections set to 1024
        Listening on 0.0.0.0:5000, CTRL+C to stop
-=====> end myapp container output
+=====> end node-js-app container output
 -----> Running post-deploy
------> Configuring myapp.dokku.example.com...
+-----> 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.example.com
+       http://myapp.dokku.me
 ```
 
 ## Example: Failing Rails Deployment
@@ -360,7 +360,7 @@ git push dokku master
 
 ```
 -----> Cleaning up...
------> Building myapp from herokuish...
+-----> Building node-js-app from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -370,8 +370,8 @@ git push dokku master
 
 Discovering process types
 Procfile declares types -> web
-Releasing myapp...
-Deploying myapp...
+Releasing node-js-app...
+Deploying node-js-app...
 Running pre-flight checks
 -----> Attempt 1/6 Waiting for 10 seconds ...
        CHECKS expected result:
@@ -410,7 +410,7 @@ curl: (22) The requested URL returned error: 500 Internal Server Error
 curl: (22) The requested URL returned error: 500 Internal Server Error
 Could not start due to 1 failed checks.
  !    Check attempt 6/6 failed.
-=====> myapp container output:
+=====> node-js-app container output:
        => Booting Thin
        => Rails 4.2.0 application starting in production on http://0.0.0.0:5000
        => Run `rails server -h` for more startup options
@@ -431,9 +431,9 @@ Could not start due to 1 failed checks.
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:242:in `initialize'
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `new'
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `postgresql_connection
-=====> end myapp container output
+=====> end node-js-app container output
 /usr/bin/dokku: line 49: 23409 Killed                  dokku deploy "$APP"
-To dokku@dokku.example.com:myapp
+To dokku@dokku.me:myapp
  ! [remote rejected] dokku -> master (pre-receive hook declined)
-error: failed to push some refs to 'dokku@dokku.example.com:myapp'
+error: failed to push some refs to 'dokku@dokku.me:myapp'
 ```

docs/development/plugin-triggers.md

@@ -29,36 +29,28 @@ 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.
 
-### `post-config-update`
+### `app-urls`
 
-- Description: Allows you to get notified when one or more configs is added or removed. Action can be *set* or *unset*
-- Invoked by: `dokku config:set`, `dokku config:unset`
-- Arguments: `$APP` `set|unset` `key1=VALUE1 key2=VALUE2`
+- Description: Allows you to change the urls Dokku reports for an application. Will override any auto-detected urls.
+- Invoked by: `dokku deploy`, `dokku url`, and `dokku urls`
+- Arguments: `$APP $URL_TYPE`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-
+# Sets the domain to `internal.tld`
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-# TODO
-```
-
-### `bind-external-ip`
-
-- Description: Allows you to disable binding to the external box ip
-- Invoked by: `dokku deploy`
-- Arguments: `$APP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Force always binding to the docker ip, no matter
-# what the settings are for a given app.
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-echo false
+APP="$1"; URL_TYPE="$2"
+case "$URL_TYPE" in
+  url)
+    echo "https://internal.tld/${APP}/"
+    ;;
+  urls)
+    echo "https://internal.tld/${APP}/"
+    echo "http://internal.tld/${APP}/"
+    ;;
+esac
 ```
 
 ### `check-deploy`
@@ -138,7 +130,7 @@ esac
 
 > 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.
 
-- Description: Allows running of commands after an application's processes have been scaled up, but before old containers are torn down. Dokku core currently uses this to switch traffic on nginx.
+- Description: Allows running of commands after an app's processes have been scaled up, but before old containers are torn down. Dokku core currently uses this to switch traffic on nginx.
 - Invoked by: `dokku deploy`
 - Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS $IMAGE_TAG`
 - Example:
@@ -154,7 +146,7 @@ curl "http://httpstat.us/200"
 
 ### `dependencies`
 
-- Description: Used to install system-level dependencies. Invoked by `plugin:install-dependencies`.
+- Description: Used to install system-level dependencies.
 - Invoked by: `dokku plugin:install-dependencies`
 - Arguments: None
 - Example:
@@ -179,20 +171,31 @@ case "$DOKKU_DISTRO" in
 esac
 ```
 
-### `deployed-app-image-tag`
+### `deploy-source`
 
-- Description: Used to manage the tag of the image being deployed. Useful for deploying a specific version of an image, or when deploying from an external registry
-- Invoked by: `internal function dokku_deploy_cmd() (deploy phase)`
+- Description: Used for reporting what the current detected deployment source is. The first detected source should always win.
+- Invoked by: `dokku apps:report`
 - Arguments: `$APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
+# Checks if the app should be deployed via git
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-# customize the tag version
-echo 'not-latest'
+APP="$1"
+STDIN=$(cat)
+
+# bail if another source is detected
+if [[ -n "$STDIN" ]]; then
+  echo "$STDIN"
+  return
+fi
+
+if [[ -d "$DOKKU_ROOT/$APP/refs" ]]; then
+  echo "git"
+fi
 ```
 
 ### `deployed-app-image-repo`
@@ -212,6 +215,22 @@ APP="$1"
 echo "dokkupaas/$APP"
 ```
 
+### `deployed-app-image-tag`
+
+- Description: Used to manage the tag of the image being deployed. Useful for deploying a specific version of an image, or when deploying from an external registry
+- Invoked by: `internal function dokku_deploy_cmd() (deploy phase)`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# customize the tag version
+echo 'not-latest'
+```
+
 ### `deployed-app-repository`
 
 - Description: Used to manage the remote repository of the image being deployed.
@@ -240,19 +259,14 @@ echo 'derp.dkr.ecr.us-east-1.amazonaws.com'
 # to bust cache at any arbitrary point in a Dockerfile build
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-cache-bust-build-arg() {
-  declare desc="dockerfile cache busting plugin trigger"
-  local STDIN=$(cat)
-  local APP="$1" IMAGE_SOURCE_TYPE="$2"
-  local output=""
+STDIN=$(cat)
+APP="$1"; IMAGE_SOURCE_TYPE="$2"
+output=""
 
-  if [[ "$IMAGE_SOURCE_TYPE" == "dockerfile" ]]; then
-    output=" --build-arg CACHEBUST=$(date +%s)"
-  fi
-  echo -n "$STDIN$output"
-}
-
-cache-bust-build-arg "$@"
+if [[ "$IMAGE_SOURCE_TYPE" == "dockerfile" ]]; then
+  output=" --build-arg CACHEBUST=$(date +%s)"
+fi
+echo -n "$STDIN$output"
 ```
 
 ### `docker-args-deploy`
@@ -321,7 +335,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-> WARNING: The `git-pre-pull` trigger should _not_ be used for authentication
+> Warning: The `git-pre-pull` trigger should _not_ be used for authentication
 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.
 
@@ -359,6 +373,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `network-clear-config`
+
+- Description: Clears network configuration
+- Invoked by: `internally triggered by proxy-clear-config within proxy implementations`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `network-compute-ports`
 
 - Description: Computes the ports for a given app container
@@ -419,11 +448,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `network-get-property`
+### `network-get-port`
 
-- Description: Return the network value for an application's property
+- Description: Return the port for a given app container
 - Invoked by: `internally triggered by a deploy`
-- Arguments: `$APP $KEY`
+- Arguments: `$APP $PROC_TYPE $CONTAINER_ID $IS_HEROKUISH_CONTAINER`
 - Example:
 
 ```shell
@@ -434,11 +463,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `network-get-port`
+### `network-get-property`
 
-- Description: Return the port for a given app container
+- Description: Return the network value for an app's property
 - Invoked by: `internally triggered by a deploy`
-- Arguments: `$APP $PROC_TYPE $CONTAINER_ID $IS_HEROKUISH_CONTAINER`
+- Arguments: `$APP $KEY`
 - Example:
 
 ```shell
@@ -481,14 +510,14 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 ### `nginx-hostname`
 
-- Description: Allows you to customize the hostname for a given application.
+- Description: Allows you to customize the hostname for a given app
 - Invoked by: `dokku domains:setup`
 - Arguments: `$APP $SUBDOMAIN $VHOST`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Reverses the hostname for the application
+# Reverses the hostname for the app
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
@@ -515,9 +544,39 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 nginx -t
 ```
 
+### `post-app-clone`
+
+- Description: Allows you to run commands after an app was cloned.
+- Invoked by: `dokku apps:clone`
+- Arguments: `$OLD_APP_NAME $NEW_APP_NAME`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `post-app-rename`
+
+- Description: Allows you to run commands after an app was renamed.
+- 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 applications using buildpacks.
+- 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`
 - Example:
@@ -532,7 +591,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 ### `post-build-dockerfile`
 
-- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using a dockerfile.
+- Description: Allows you to run commands after the build image is create for a given app. Only applies to apps using a dockerfile.
 - Invoked by: `internal function dokku_build() (build phase)`
 - Arguments: `$APP`
 - Example:
@@ -579,9 +638,24 @@ APP="$1"; verify_app_name "$APP"
 # TODO
 ```
 
+### `post-config-update`
+
+- Description: Allows you to get notified when one or more configs is added or removed. Action can be *set* or *unset*
+- Invoked by: `dokku config:set`, `dokku config:unset`
+- Arguments: `$APP` `set|unset` `key1=VALUE1 key2=VALUE2`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `post-create`
 
-- Description: Can be used to run commands after an application is created.
+- Description: Can be used to run commands after an app is created.
 - Invoked by: `dokku apps:create`
 - Arguments: `$APP`
 - Example:
@@ -602,7 +676,7 @@ dokku postgres:link $POSTGRES $APP
 
 ### `post-delete`
 
-- Description: Can be used to run commands after an application is deleted.
+- Description: Can be used to run commands after an app is deleted.
 - Invoked by: `dokku apps:destroy`
 - Arguments: `$APP $IMAGE_TAG`
 - Example:
@@ -623,7 +697,7 @@ dokku postgres:destroy $APP
 
 > Please see [core-post-deploy](#core-post-deploy) if contributing a core plugin with the `post-deploy` hook.
 
-- Description: Allows running of commands after an application's processes have been scaled up, but before old containers are torn down. Dokku calls this _after_ `core-post-deploy`. Deployment Tasks are also invoked by this plugin trigger.
+- Description: Allows running of commands after an app's processes have been scaled up, but before old containers are torn down. Dokku calls this _after_ `core-post-deploy`. Deployment Tasks are also invoked by this plugin trigger.
 - Invoked by: `dokku deploy`
 - Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS $IMAGE_TAG`
 - Example:
@@ -639,7 +713,7 @@ curl "http://httpstat.us/200"
 
 ### `post-domains-update`
 
-- Description: Allows you to run commands once the domain for an application has been updated. It also sends in the command that has been used. This can be "add", "clear" or "remove". The third argument will be the optional list of domains
+- Description: Allows you to run commands once the domain for an app has been updated. It also sends in the command that has been used. This can be "add", "clear" or "remove". The third argument will be the optional list of domains
 - Invoked by: `dokku domains:add`, `dokku domains:clear`, `dokku domains:remove`, `dokku domains:set`
 - Arguments: `$APP` `action name` `domains`
 - Example:
@@ -656,7 +730,7 @@ sudo service haproxy reload
 
 ### `post-extract`
 
-- Description: Allows you to modify the contents of an application *after* it has been extracted from git/tarball but *before* the image source type is detected.
+- Description: Allows you to modify the contents of an app *after* it has been extracted from git/tarball but *before* the image source type is detected.
 - Invoked by: `dokku tar:in`, `dokku tar:from` and the `receive-app` plugin trigger
 - Arguments: `$APP` `$TMP_WORK_DIR` `$REV`
 - Example:
@@ -678,7 +752,7 @@ echo "clock: some-command" >> Procfile
 
 ### `post-proxy-ports-update`
 
-- Description: Allows you to run commands once the proxy port mappings for an application have been updated. It also sends the invoking command. This can be "add", "clear" or "remove".
+- Description: Allows you to run commands once the proxy port mappings for an app have been updated. It also sends the invoking command. This can be "add", "clear" or "remove".
 - Invoked by: `dokku proxy:ports-add`, `dokku proxy:ports-clear`, `dokku proxy:ports-remove`
 - Arguments: `$APP` `action name`
 - Example:
@@ -698,7 +772,7 @@ haproxy-build-config "$APP"
 
 ### `post-release-buildpack`
 
-- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
+- 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`
 - Example:
@@ -725,7 +799,7 @@ docker commit $ID $IMAGE > /dev/null
 
 ### `post-release-dockerfile`
 
-- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
+- 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`
 - Example:
@@ -743,14 +817,14 @@ verify_app_name "$APP"
 
 ### `post-stop`
 
-- Description: Can be used to run commands after an application is manually stopped
+- Description: Can be used to run commands after an app is manually stopped
 - Invoked by: `dokku ps:stop` and `dokku ps:stopall`
 - Arguments: `$APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Marks an application as manually stopped
+# Marks an app as manually stopped
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
@@ -761,7 +835,7 @@ dokku config:set --no-restart $APP MANUALLY_STOPPED=1
 
 ### `pre-build-buildpack`
 
-- 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 applications using buildpacks.
+- 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`
 - Example:
@@ -776,7 +850,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 ### `pre-build-dockerfile`
 
-- 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 applications using a dockerfile.
+- 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 a dockerfile.
 - Invoked by: `internal function dokku_build() (build phase)`
 - Arguments: `$APP`
 - Example:
@@ -798,7 +872,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 ```shell
 #!/usr/bin/env bash
-# Clears out the gulp asset build cache for applications
+# Clears out the gulp asset build cache for apps
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
@@ -813,7 +887,7 @@ fi
 
 ### `pre-deploy`
 
-- Description: Allows the running of code before the application's processes are scaled up and after the docker images are prepared.
+- Description: Allows the running of code before the app's processes are scaled up and after the docker images are prepared.
 - Invoked by: `dokku deploy`
 - Arguments: `$APP $IMAGE_TAG`
 - Example:
@@ -834,70 +908,6 @@ docker commit $id $IMAGE > /dev/null
 dokku_log_info1 "Building UI Complete"
 ```
 
-### `pre-receive-app`
-
-- Description: Allows you to customize the contents of an application directory before they are processed for deployment. The `IMAGE_SOURCE_TYPE` can be any of `[herokuish, dockerfile]`
-- Invoked by: `dokku git-hook`, `dokku tar-build-locked`
-- Arguments: `$APP $IMAGE_SOURCE_TYPE $TMP_WORK_DIR $REV`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Adds a file called `dokku-is-awesome` to the repository
-# the contents will be the application name
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1"; IMAGE_SOURCE_TYPE="$2"; TMP_WORK_DIR="$3"; REV="$4"
-
-echo "$APP" > "$TMP_WORK_DIR/dokku-is-awesome"
-```
-
-### `pre-release-buildpack`
-
-- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
-- Invoked by: `internal function dokku_release() (release phase)`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Installs the graphicsmagick package into the container
-
-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 GraphicsMagick..."
-
-CMD="cat > gm && \
-  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
-```
-
-### `pre-release-dockerfile`
-
-- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
-- Invoked by: `internal function dokku_release() (release phase)`
-- Arguments: `$APP $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_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-# TODO
-```
-
 ### `pre-disable-vhost`
 
 - Description: Allows you to run commands before the VHOST feature is disabled
@@ -932,22 +942,102 @@ APP="$1"; verify_app_name "$APP"
 # TODO
 ```
 
+### `pre-receive-app`
+
+- Description: Allows you to customize the contents of an app directory before they are processed for deployment. The `IMAGE_SOURCE_TYPE` can be any of `[herokuish, dockerfile]`
+- Invoked by: `dokku git-hook`, `dokku tar-build-locked`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE $TMP_WORK_DIR $REV`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Adds a file called `dokku-is-awesome` to the repository
+# the contents will be the app name
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; IMAGE_SOURCE_TYPE="$2"; TMP_WORK_DIR="$3"; REV="$4"
+
+echo "$APP" > "$TMP_WORK_DIR/dokku-is-awesome"
+```
+
+### `pre-release-buildpack`
+
+- Description: Allows you to run commands before 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`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Installs the graphicsmagick package into the container
+
+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 GraphicsMagick..."
+
+CMD="cat > gm && \
+  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
+```
+
+### `pre-release-dockerfile`
+
+- Description: Allows you to run commands before 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`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+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"
+
+# TODO
+```
+
+### `pre-restore`
+
+- Description: Allows you to run commands before all containers are restored
+- Invoked by: `dokku ps:restore`
+- Arguments: `$DOKKU_SCHEDULER`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"
+
+# TODO
+```
+
 ### `pre-start`
 
-- Description: Can be used to run commands before an application is started
+- Description: Can be used to run commands before an app is started
 - Invoked by: `dokku ps:start`
 - Arguments: `$APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Notifies an example url that an application is starting
+# Notifies an example url that an app is starting
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 APP="$1";
 
-curl "https://example.com/starting/${APP}" || true
+curl "https://dokku.me/starting/${APP}" || true
 ```
 
 ### `proxy-build-config`
@@ -965,6 +1055,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `proxy-clear-config`
+
+- Description: Clears the proxy implementation configuration for a given app
+- Invoked by: `internally triggered by apps:rename`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `proxy-enable`
 
 - Description: Enables the configured proxy implementation for an app
@@ -997,7 +1102,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 ### `receive-app`
 
-- Description: Allows you to customize what occurs when an app is received. Normally just triggers an application build.
+- Description: Allows you to customize what occurs when an app is received. Normally just triggers an app build.
 - Invoked by: `dokku git-hook`, `dokku ps:rebuild`
 - Arguments: `$APP $REV` (`$REV` may not be included in cases where a repository is not pushed)
 - Example:
@@ -1051,19 +1156,168 @@ plugn trigger receive-app $APP $newrev
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 APP="$1"; HOSTNAME=$(hostname -s)
 
-mail -s "$APP containers on $HOSTNAME failed to retire" ops@example.com
+mail -s "$APP containers on $HOSTNAME failed to retire" ops@dokku.me
+```
+
+### `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
+```
+
+### `scheduler-deploy`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when an app is deployed
+- Invoked by: `dokku deploy`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_TAG="$3";
+
+# TODO
+```
+
+### `scheduler-docker-cleanup`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when dokku cleanup is invoked
+- Invoked by: `dokku deploy, dokku cleanup`
+- Arguments: `$DOKKU_SCHEDULER $APP $FORCE_CLEANUP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; FORCE_CLEANUP="$3";
+
+# TODO
+```
+
+### `scheduler-logs-failed`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when retrieving failed container logs
+- Invoked by: `dokku logs:failed`
+- Arguments: `$DOKKU_SCHEDULER $APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
+
+# TODO
+```
+
+### `scheduler-run`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when a command is executed for your app
+- Invoked by: `dokku run`
+- Arguments: `$DOKKU_SCHEDULER $APP ...ARGS`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
+
+# TODO
+```
+
+### `scheduler-stop`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when a tag is destroyed
+- Invoked by: `dokku apps:destroy, dokku ps:stop`
+- Arguments: `$DOKKU_SCHEDULER $APP $REMOVE_CONTAINERS`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; REMOVE_CONTAINERS="$3";
+
+# TODO
+```
+
+### `scheduler-tags-create`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when a tag is created
+- Invoked by: `dokku tags:create`
+- Arguments: `$DOKKU_SCHEDULER $APP $SOURCE_IMAGE $TARGET_IMAGE`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1" APP="$2" SOURCE_IMAGE="$3" TARGET_IMAGE="$4"
+
+# TODO
+```
+
+### `scheduler-tags-destroy`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when a tag is destroyed
+- Invoked by: `dokku tags:destroy`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_REPO $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_REPO="$3"; IMAGE_TAG="$4";
+
+# TODO
 ```
 
 ### `tags-create`
 
-- Description: Allows you to run commands once a tag for an application image has been added
+- Description: Allows you to run commands once a tag for an app image has been added
 - Invoked by: `dokku tags:create`
 - Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Upload an application image to docker hub
+# Upload an app image to docker hub
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
@@ -1075,7 +1329,7 @@ docker push $DOCKER_HUB_USER/$APP:$IMAGE_TAG
 
 ### `tags-destroy`
 
-- Description: Allows you to run commands once a tag for an application image has been removed
+- Description: Allows you to run commands once a tag for an app image has been removed
 - Invoked by: `dokku tags:destroy`
 - Arguments: `$APP $IMAGE_TAG`
 - Example:
@@ -1147,7 +1401,7 @@ sshcommand acl-add dokku NAME < $PATH_TO_SSH_KEY
 Note that the `NAME` value is set at the first ssh key match. If an ssh key is set in the `/home/dokku/.ssh/authorized_keys` multiple times, the first match will decide the value.
 
 - Description: Allows you to deny access to a Dokku command by either ssh user or associated ssh-command NAME user.
-- Invoked by `dokku`
+- Invoked by: `dokku`
 - Arguments: `$SSH_USER $SSH_NAME $DOKKU_COMMAND`
 - Example:
 

docs/development/release-process.md

@@ -4,60 +4,23 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas
 
 To propose a release, the following tasks need to be performed:
 
-- Update all blockquote references of `not yet released and only available in master` to point to release version.
-- The installable version must be changed in the `contrib/dokku-installer.py` file.
-- The installable version must be changed in the `debian/control` file.
-- The installable version must be changed in the `docs/home.html` file
-- The installable version must be changed in the `docs/installation.md` file.
-- The installable version must be changed in the `docs/template.html` file.
-- The installable version must be changed in the `README.md` file.
-- The embedded css should be cleared in the `docs/template.html` file.
-- The versioned links should be updated in the `docs/assets/favicons/browserconfig.xml` file.
-- The versioned links should be updated in the `docs/assets/favicons/manifest.json` file.
-- The versioned links should be updated in the `docs/assets/style.css` file.
-- The versioned links should be updated in the `docs/home.html` file.
-- The versioned links should be updated in the `docs/template.html` file.
-- The versioned links should be updated or added to the `docs/assets/versions.json` file.
-- A list of changes must be made in the `HISTORY.md`.
-- A tag must be created locally with your release version
-- Debian and RPM packages *must* be created via `vagrant up build`
-- The packages should be uploaded to packagecloud.io
-- All changes are pushed to master and the tag should be turned into a release which will contain the changelog.
-- ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that)
+```shell
+export PACKAGECLOUD_API_TOKEN=SOME_TOKEN
+# supports major/minor/patch/betafish
+contrib/release
+```
+
+> If you are a maintainer and need the PACKAGECLOUD_API_TOKEN in order to make a release, please contact @josegonzalez to get this information.
+
+
+As well, the ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that)
 
 ## Versioning
 
 Dokku follows semver standards. As we are not yet at a stable release, breaking changes will require *only* a minor release, while all other changes only require a patch release. Once we hit stable, breaking changes will require a major release.
 
-Tags should be created via the following method:
-
-```shell
-git tag v0.9.9
-```
-
 At the moment, tags need not be signed, though that may change in the future.
 
-## Debian and RPM packages
-
-The `build` target in the Dokku `Vagrantfile` creates debian and rpm packages for Dokku at a point in time. The version will be based upon the latest local tag - you may create your own, internal tags/releases if that is so desired.
-
-Debian package information is held in the `debian` directory of the Dokku project.
-
-For the public project, releases should be pushed to packagecloud.io *after* a tag is created but *before* said tag is pushed to github. The following may be the release workflow:
-
-
-```shell
-git tag v0.9.9
-vagrant up build
-export PACKAGECLOUD_TOKEN=SOME_TOKEN
-package_cloud push dokku/dokku/ubuntu/trusty dokku_0.9.9_amd64.deb
-package_cloud push dokku/dokku/el/7 dokku-0.9.9-1.x86_64.rpm
-```
-
-If new versions of other packages were created, these should also be pushed at this time.
-
-> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
-
 ## ArchLinux Packages
 
 ArchLinux packages are not really build, because all that is needed for an Arch User Repo (AUR) package is the description of how to build the package. To make this process as easy as possible there is a vagrant box called `build-arch` that updates the version of this build description (a file called `PKGBUILD`), then runs some helper scripts to fill all additional information and does test if the package could be build. Then only those changes need to be pushed to the AUR repo and an updated version of the package is ready for usage for our ArchLinux users. For detailed information see the section below.
@@ -67,7 +30,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.11.4-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.12.11-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'
@@ -76,29 +39,7 @@ git push aur master
 
 > If you are a maintainer and need access to the AUR repositories in order to make a release, please contact @morrisjobke or @josegonzalez to get this co-maintainership.
 
-## Changelog format
-
-The `HISTORY.md` should be added to based on the changes made since the previous release. This can be done by reviewing all merged pull requests to the master branch on github. The format is as follows:
-
-```
-## 0.9.9
-
-Some description concerning major changes in this release, or potential incompatibilities.
-
-### New Features
-
-- #SOME_ID: @pull-request-creator Description
-
-### Bug Fixes
-
-- #SOME_ID: @pull-request-creator Description
-
-### Docs Changes
-
-- #SOME_ID: @pull-request-creator Description
-```
-
-## Detailed information for ArchLinux packages
+### Detailed information for ArchLinux packages
 
 All of the information to build the ArchLinux package is in the AUR git repository (see [dokku AUR page](https://aur.archlinux.org/packages/dokku/)). The release of a AUR package only consists of pushing the package information into the AUR git repo. Then users could use that information to build the package on their machines.
 

docs/getting-started/install/debian.md

@@ -12,7 +12,9 @@ wget -nv -O - https://get.docker.com/ | sh
 
 # install dokku
 wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
-echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
+OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
+echo "trusty utopic vivid wily xenial yakkety zesty artful bionic" | grep -q "$OS_ID" || OS_ID="trusty"
+echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list
 sudo apt-get update -qq > /dev/null
 sudo apt-get install -qq -y dokku
 sudo dokku plugin:install-dependencies --core

docs/getting-started/install/vagrant.md

@@ -23,7 +23,7 @@
     # for most users
     vagrant up
     
-    # windows users must instead use the following
+    # windows users must instead use the following in an elevated command prompt
     vagrant up dokku-windows
     ```
 

docs/getting-started/installation.md

@@ -21,8 +21,8 @@ To install the latest stable version of dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.11.4/bootstrap.sh;
-sudo DOKKU_TAG=v0.11.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.12.11/bootstrap.sh;
+sudo DOKKU_TAG=v0.12.11 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
@@ -35,13 +35,13 @@ Once the installation is complete, you can open a browser to setup your SSH key
 
 Alternatively, instructions to skip the web installer with an unattended installation are available in the [advanced install guide](/docs/getting-started/advanced-installation/#configuring). 
 
-> **Warning:** If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your Dokku installation will remain vulnerable to anyone finding the setup page and inserting their key.
+> **Warning:** If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your Dokku installation will remain vulnerable to anyone finding the setup page and inserting their key. You can check if it is still running via `ps auxf | grep dokku-installer`, and it may be stopped via your server's init system - usually either `service dokku-installer stop` or `stop dokku-installer`.
 
 > **Warning:** Web installer is not available on CentOS and Arch Linux. You will need to configure [SSH keys](/docs/deployment/user-management.md#adding-ssh-keys) and [virtual hosts](/docs/configuration/domains.md#customizing-hostnames) using dokku command line interface - see unattended installation linked above.
 
 #### 3. Deploy your first application
 
-Once you save your settings, the web admin will self-terminate and you should be able to run or deploy to the Dokku installation.
+Once you save your settings, the web admin will self-terminate and you should be able to run or [deploy to the Dokku installation](/docs/deployment/application-deployment.md).
 
 ### Installing via other methods
 

docs/getting-started/troubleshooting.md

@@ -146,10 +146,10 @@ 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: 3 seconds, total maximum time for operation: 30 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=600
+dokku config:set --global CURL_TIMEOUT=1200
 dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
 

docs/getting-started/upgrading.md

@@ -67,7 +67,7 @@ dokku --quiet apps:list | xargs -L1 dokku ps:stop
 # for versions versions older than 0.8.1, use
 dokku --quiet apps | xargs -L1 dokku ps:stop
 
-# update dokku and it's dependencies
+# update dokku and its dependencies
 sudo apt-get install -qq -y dokku herokuish sshcommand plugn
 
 # rebuild all of your applications

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.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
     </style>
@@ -98,12 +98,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.11.4/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.12.11/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.11.4 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.12.11 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
@@ -135,7 +135,17 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">echo "deb $SOURCE trusty main" | tee /etc/apt/sources.list.d/dokku.list</span>
+            <span class="command">export OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"</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>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">echo "deb $SOURCE $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list</span>
           </p>
           <p class="line">
             <span class="path"></span>
@@ -173,8 +183,8 @@
       </div>
 
       <div class="alternate-instructions">
-        <p>Hate <code>curl | bash</code>? See our official <a href="https://github.com/Azure/azure-quickstart-templates/tree/master/dokku-vm" target="_blank">Azure</a>, <a href="https://www.digitalocean.com/features/one-click-apps/dokku/" target="_blank">DigitalOcean</a>, and <a href="/{{NAME}}~{{REF}}/getting-started/install/dreamhost/">DreamHost Cloud</a> instructions.<p>
-        <p>Still no love? <a href="https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md" target="_blank">Contributions welcome</a>!</a>
+        <p>Hate <code>curl | bash</code>? See our official <a href="https://github.com/Azure/azure-quickstart-templates/tree/master/dokku-vm" target="_blank">Azure</a>, <a href="https://www.digitalocean.com/features/one-click-apps/dokku/" target="_blank">DigitalOcean</a>, and <a href="/{{NAME}}~{{REF}}/getting-started/install/dreamhost/">DreamHost Cloud</a> instructions.</p>
+        <p>Still no love? <a href="https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md" target="_blank">Contributions welcome</a>!</a></p>
       </div>
     </div>
 

docs/networking/dns.md

@@ -28,15 +28,15 @@ Don't be afraid to ask if you need help.  Create a [new issue](https://github.co
 
 For the examples, we will use the domain name `example.tld` and the IP address `127.0.0.1`.
 
-Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `myapp1` and `myapp2`, Dokku will make them available at `myapp1.example.tld` and `myapp2.example.tld`.
+Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `node-js-app1` and `node-js-app2`, Dokku will make them available at `node-js-app1.example.tld` and `node-js-app2.example.tld`.
 
 To get started, you need to know the IP address of your Dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.
 
 Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your Dokku server, or would you rather use a 'sub domain' for your Dokku server?
 
-In other words, do you want your applications on your Dokku server accessible via `myapp.example.tld` or via `myapp.myserver.example.tld`?
+In other words, do you want your applications on your Dokku server accessible via `node-js-app.example.tld` or via `node-js-app.myserver.example.tld`?
 
-#### Using a sub-domain (myapp.myserver.example.tld)
+#### Using a sub-domain (node-js-app.myserver.example.tld)
 
 Using a sub-domain is easy.  When you set up your server, you probably gave it a name like `myserver.example.tld`.
 
@@ -71,7 +71,7 @@ If they all return your IP address, you have set DNS up properly for dokku.  You
 
 Proceed with the setup instructions in the [installation documentation](/docs/getting-started/installation.md)
 
-#### Using the root of your domain (myapp.example.tld)
+#### Using the root of your domain (node-js-app.example.tld)
 
 This section is a work in progress.  It is incomplete.
 

docs/networking/port-management.md

@@ -4,7 +4,8 @@
 
 ```
 proxy:ports <app>                        # List proxy port mappings for app
-proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set 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
 ```
@@ -86,7 +87,22 @@ curl http://node-js-app.dokku.me:8080
 Hello World!
 ```
 
-You can also remove a port mapping that is no longer necessary:
+Port mappings can also be force set using the `proxy:ports-set` command.
+
+```shell
+dokku proxy:ports-set node-js-app http:8080:5000
+```
+
+```
+-----> Setting config vars
+       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
+```
+
+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
@@ -98,7 +114,7 @@ By default, buildpack apps and dockerfile apps **without** explicitly exposed po
 
 ## Port management by Deployment Method
 
-> WARNING: If you set a proxy port map but _do not have a global domain set_, Dokku will reset that map upon first deployment.
+> Warning: If you set a proxy port map but _do not have a global domain set_, Dokku will reset that map upon first deployment.
 
 ### Buildpacks
 

docs/template.html

@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.11/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.11.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.12.11/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>
@@ -131,6 +131,7 @@
             <a href="/{{NAME}}/deployment/methods/buildpacks/" class="list-group-item">Buildpack Deployment</a>
             <a href="/{{NAME}}/deployment/methods/dockerfiles/" class="list-group-item">Dockerfile Deployment</a>
             <a href="/{{NAME}}/deployment/methods/images/" class="list-group-item">Docker Image Deployment</a>
+            <a href="/{{NAME}}/deployment/methods/git/" class="list-group-item">Git Deployment</a>
             <a href="/{{NAME}}/deployment/methods/tar/" class="list-group-item">Tarfile Deployment</a>
 
             <a href="#" class="list-group-item disabled">Configuration</a>
@@ -157,10 +158,9 @@
             <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="#" class="list-group-item disabled">Community Contributions</a>
+            <a href="#" class="list-group-item disabled">Schedulers</a>
 
-            <a href="/{{NAME}}/community/clients/" class="list-group-item">Clients</a>
-            <a href="/{{NAME}}/community/plugins/" class="list-group-item">Plugins</a>
+            <a href="/{{NAME}}/advanced-usage/schedulers/docker-local/" class="list-group-item">Docker Local</a>
 
             <a href="#" class="list-group-item disabled">Development</a>
 
@@ -168,6 +168,14 @@
             <a href="/{{NAME}}/development/plugin-triggers/" class="list-group-item">Plugin Triggers</a>
             <a href="/{{NAME}}/development/testing/" class="list-group-item">Running Tests</a>
             <a href="/{{NAME}}/development/release-process/" class="list-group-item">Release Process</a>
+
+            <a href="#" class="list-group-item disabled">Community Contributions</a>
+            <a href="/{{NAME}}/community/clients/" class="list-group-item">Clients</a>
+            <a href="/{{NAME}}/community/plugins/" class="list-group-item">Plugins</a>
+
+            <a href="#" class="list-group-item disabled">Community Tutorials</a>
+            <a href="/{{NAME}}/community/tutorials/deploying-with-gitlab-ci/" class="list-group-item">Deploying with Gitlab CI</a>
+            <a href="/{{NAME}}/community/tutorials/run-on-external-volume/" class="list-group-item">Run on External Volume</a>
           </div>
         </div>
       </div>
@@ -375,7 +383,10 @@
       }
 
       Array.prototype.forEach.call(blockquotes, function (el, i) {
-        if (el.innerHTML.toLowerCase().indexOf('new as of') !== -1) {
+        if (el.innerHTML.toLowerCase().indexOf('warning') !== -1) {
+          addClass(el, 'warning');
+          el.innerHTML = el.innerHTML.replace('Warning', '<strong>Warning</strong>')
+        } else if (el.innerHTML.toLowerCase().indexOf('new as of') !== -1) {
           addClass(el, 'new-as-of');
         } else if (el.innerHTML.toLowerCase().indexOf('not yet released') !== -1) {
           addClass(el, 'not-yet-released');

dokku

@@ -2,6 +2,11 @@
 set -eo pipefail
 shopt -s nullglob
 
+if [[ -r /etc/default/dokku ]]; then
+  # shellcheck disable=SC1091
+  source /etc/default/dokku
+fi
+
 export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
 if [[ -f "$DOKKU_ROOT/dokkurc" ]]; then
   if [[ -r $DOKKU_ROOT/dokkurc ]]; then
@@ -22,6 +27,7 @@ if [[ -d $DOKKU_ROOT/.dokkurc ]]; then
   done
 fi
 [[ $DOKKU_TRACE ]] && set -x
+export DOKKU_HOST_ROOT=${DOKKU_HOST_ROOT:=$DOKKU_ROOT}
 
 export DOKKU_DISTRO
 # shellcheck disable=SC1091
@@ -36,6 +42,8 @@ export PLUGIN_ENABLED_PATH=${PLUGIN_ENABLED_PATH:="$PLUGIN_PATH/enabled"}
 export PLUGIN_CORE_PATH=${PLUGIN_CORE_PATH:="$DOKKU_LIB_ROOT/core-plugins"}
 export PLUGIN_CORE_AVAILABLE_PATH=${PLUGIN_CORE_AVAILABLE_PATH:="$PLUGIN_CORE_PATH/available"}
 export PLUGIN_CORE_ENABLED_PATH=${PLUGIN_CORE_ENABLED_PATH:="$PLUGIN_CORE_PATH/enabled"}
+export DOKKU_SYSTEM_GROUP=${DOKKU_SYSTEM_GROUP:="dokku"}
+export DOKKU_SYSTEM_USER=${DOKKU_SYSTEM_USER:="dokku"}
 
 export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
@@ -185,20 +193,20 @@ case "$1" in
     done
 
     # New lines are blank echos for readability
-    echo "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
-    echo ""
-    echo "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands."
-    echo ""
-    echo "Commands:"
-    echo ""
+    dokku_log_quiet "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
+    dokku_log_quiet ""
+    dokku_log_quiet "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands."
+    dokku_log_quiet ""
+    dokku_log_quiet "Commands:"
+    dokku_log_quiet ""
 
     if [[ "$2" == "--all" ]] ; then
       for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
         $core_plugin_command help
       done | sort | column -c2 -t -s,
-      echo ""
-      echo "Community plugin commands:"
-      echo ""
+      dokku_log_quiet ""
+      dokku_log_quiet "Community plugin commands:"
+      dokku_log_quiet ""
       for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
         $community_plugin_command help
       done | sort | column -c2 -t -s,
@@ -208,9 +216,9 @@ case "$1" in
       # When done, sort, sed cuts arugments out of strings and colum make it pretty
       done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s,
       if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then
-        echo ""
-        echo "Community plugin commands:"
-        echo ""
+        dokku_log_quiet ""
+        dokku_log_quiet "Community plugin commands:"
+        dokku_log_quiet ""
         for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
           $community_plugin_command help
         done | sort | column -c2 -t -s,

plugins/00_dokku-standard/commands

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-[[ " help help:help ls:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+[[ " help help:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
-  help|ls:help|run:help|trace:help|url:help|urls:help|version:help)
+  help|run:help|trace:help|url:help|urls:help|version:help)
     [[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
     help_content_func () {
       declare desc="return standard plugin help content"
       cat<<help_content
-    ls , Pretty listing of deployed applications and containers
     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)

plugins/00_dokku-standard/core-post-deploy

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-cleanup_container_state() {
-  declare desc="core post-deploy state cleanup"
-  local trigger="core-post-deploy cleanup_container_state"
-  local APP="$1"; local PROCTYPES="$(egrep -v "^#" "$DOKKU_ROOT/$APP/DOKKU_SCALE" | awk -F '=' '{ print $1 }' | xargs)"
-  local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 3 -n | xargs)"
-
-  local CONTAINER_FILE
-  for CONTAINER_FILE in $CONTAINER_FILES; do
-    local CONTAINER_TYPE="$(awk -F '.' '{ print $2 }' <<< "$CONTAINER_FILE")"
-    if [[ "$(is_val_in_list "$CONTAINER_TYPE" "$PROCTYPES" " ")" == "false" ]]; then
-      dokku_log_info1 "Container type ($CONTAINER_TYPE) is no longer defined. Removing state"
-      local IP_FILE="${CONTAINER_FILE//CONTAINER/IP}"
-      local PORT_FILE="${CONTAINER_FILE//CONTAINER/PORT}"
-      rm -f "$DOKKU_ROOT/$APP/$CONTAINER_FILE" "$DOKKU_ROOT/$APP/$IP_FILE" "$DOKKU_ROOT/$APP/$PORT_FILE"
-    fi
-  done
-}
-
-cleanup_container_state "$@"

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

@@ -51,6 +51,7 @@ execute_script() {
     COMMAND+=" fi "
 
     local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+    local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
     [[ -d $CACHE_DIR ]] || mkdir -p "$CACHE_DIR"
 
     local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
@@ -61,7 +62,12 @@ execute_script() {
     declare -a ARG_ARRAY
     eval "ARG_ARRAY=($DOCKER_ARGS)"
 
-    id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" /bin/bash -c "$COMMAND")
+    local DOKKU_APP_SHELL="/bin/bash"
+    DOKKU_APP_SHELL="$(config_get --global DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+    DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+    [[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
+
+    id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
     if test "$(docker wait "$id")" -eq 0; then
       dokku_container_log_verbose_quiet "$id"
       if [[ "$PHASE_SCRIPT_KEY" != "postdeploy" ]];then

plugins/00_dokku-standard/install

@@ -39,10 +39,10 @@ User=dokku
 ExecStart=$dokku_path ps:restore
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=docker.service
 EOF
   if command -v systemctl &>/dev/null; then
-    systemctl enable dokku-redeploy
+    systemctl reenable dokku-redeploy
   fi
 fi
 

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/pre-deploy

@@ -2,7 +2,6 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 exec_app_json_scripts() {
   declare desc="core app.json scripts execution"
@@ -13,32 +12,4 @@ exec_app_json_scripts() {
   execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
 }
 
-app_user_pre_deploy_trigger() {
-  local desc="app user pre-deploy trigger"
-  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE; local DOCKER_ARGS
-  local DOKKU_APP_TYPE DOKKU_APP_USER APP_PATHS CONTAINER_PATHS
-  declare -a ARG_ARRAY
-
-  IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
-
-  DOKKU_APP_TYPE=$(config_get "$APP" DOKKU_APP_TYPE || true)
-  DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
-  DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"}
-  APP_PATHS=$(dokku --quiet storage:list "$APP" || true)
-
-  if [[ -n "$APP_PATHS" ]]; then
-    CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
-    DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
-    # strip --restart args from DOCKER_ARGS
-    DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
-    eval "ARG_ARRAY=($DOCKER_ARGS)"
-  fi
-
-  if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then
-    # shellcheck disable=SC2086
-    docker run $DOKKU_GLOBAL_RUN_ARGS "${ARG_ARRAY[@]}" $IMAGE /bin/bash -c "find $CONTAINER_PATHS -not -user $DOKKU_APP_USER -print0 | xargs -0 -r chown -R $DOKKU_APP_USER" || true
-  fi
-}
-
 exec_app_json_scripts "$@"
-app_user_pre_deploy_trigger "$@"

plugins/00_dokku-standard/subcommands/cleanup

@@ -2,9 +2,11 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-dokku_cleanup_cmd(){
+dokku_cleanup_cmd() {
   declare desc="cleans up old deployment cruft"
-  local cmd="cleanup"
+  declare cmd="cleanup"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
   docker_cleanup "$APP" "true"
 }

plugins/00_dokku-standard/subcommands/ls

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-dokku_ls_cmd() {
-  declare desc="lists installed apps with status"
-  local cmd="ls"
-  local installed_apps=$(dokku_apps)
-  local dokku_app
-
-  dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status"
-
-  for dokku_app in $installed_apps; do
-    local APP=$(basename "$dokku_app")
-    local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
-    local DOCKER_RUNNING_CONTAINERS=$(docker ps -q --no-trunc)
-    if [[ -n $DOKKU_APP_CIDS ]]; then
-      local DOKKU_APP_CID
-      for DOKKU_APP_CID in $DOKKU_APP_CIDS; do
-        local DOKKU_APP_CONTAINER_STATUS="stopped"
-        [[ $DOCKER_RUNNING_CONTAINERS =~ $DOKKU_APP_CID ]] && local DOKKU_APP_CONTAINER_STATUS="running"
-        local DOKKU_APP_CONTAINER_TYPE=$(grep -l "$DOKKU_APP_CID" "$DOKKU_ROOT/$APP"/CONTAINER.* | awk -F '/' '{ print $5 }' | awk -F '.' '{ print $2 }')
-        dokku_col_log_msg "$APP" "$DOKKU_APP_CONTAINER_TYPE" "${DOKKU_APP_CID:0:12}" "$DOKKU_APP_CONTAINER_STATUS"
-      done
-    else
-      dokku_col_log_msg "$APP" "NOT_DEPLOYED" "NOT_DEPLOYED" "NOT_DEPLOYED"
-    fi
-  done
-}
-
-dokku_ls_cmd "$@"

plugins/00_dokku-standard/subcommands/report

@@ -5,20 +5,25 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 dokku_report_cmd() {
   declare desc="reports dokku vitals for troubleshooting"
   local cmd="report"
+  declare APP="$2"
 
   dokku_log_info1 "uname: $(uname -a)"
   dokku_log_info1 "memory: "
-  free -m
+  free -m | sed "s/^/       /"
   dokku_log_info1 "docker version: "
-  docker version
+  docker version | sed "s/^/       /"
   dokku_log_info1 "docker daemon info: "
-  docker -D info
+  docker -D info | sed "s/^/       /"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
-  docker run --rm -ti gliderlabs/herokuish:latest herokuish version
+  docker run --rm -ti gliderlabs/herokuish:latest herokuish version | sed "s/^/       /"
   dokku_log_info1 "dokku version: $(dokku version)"
   dokku_log_info1 "dokku plugins: "
-  dokku plugin:list
+  dokku plugin:list | sed "s/^/       /"
+
+  if [[ -n "$APP" ]]; then
+    plugn trigger report "$APP"
+  fi
 }
 
 dokku_report_cmd "$@"

plugins/00_dokku-standard/subcommands/run

@@ -1,53 +1,16 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 dokku_run_cmd() {
   declare desc="runs command in container based on app image"
-  local cmd="run"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"; local IMAGE_TAG=$(get_running_image_tag "$APP"); local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
+  declare cmd="run" APP="$2"
   verify_app_name "$APP"
-
   shift 2
 
-  if [[ -z "$DOKKU_RM_CONTAINER" ]]; then
-    local DOKKU_APP_RM_CONTAINER=$(config_get "$APP" DOKKU_RM_CONTAINER || true)
-    local DOKKU_GLOBAL_RM_CONTAINER=$(config_get --global DOKKU_RM_CONTAINER || true)
-    local DOKKU_RM_CONTAINER=${DOKKU_APP_RM_CONTAINER:="$DOKKU_GLOBAL_RM_CONTAINER"}
-  fi
-
-  local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
-  [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
-
-  declare -a ARG_ARRAY
-  eval "ARG_ARRAY=($DOCKER_ARGS)"
-
-  local DOKKU_RUN_OPTS=" -e DYNO=run.$RANDOM"
-  if [[ "$DOKKU_RM_CONTAINER" ]]; then
-    DOKKU_RUN_OPTS+=" --rm"
-  elif [[ "$DOKKU_DETACH_CONTAINER" ]]; then
-    DOKKU_RUN_OPTS+=" --detach"
-  fi
-
-  has_tty && DOKKU_RUN_OPTS+=" -i -t"
-  is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
-
-  DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
-
-  POTENTIAL_PROCFILE_KEY="$1"
-  PROC_CMD=$(get_cmd_from_procfile "$APP" "$POTENTIAL_PROCFILE_KEY" || echo '')
-  remove_procfile "$APP"
-
-  if [ ! -z "$PROC_CMD" ]; then
-    dokku_log_info1 "Found '$POTENTIAL_PROCFILE_KEY' in Procfile, running that command"
-    set -- "$PROC_CMD" "${@:2}"
-  fi
-
-  # shellcheck disable=SC2086
-  docker run $DOKKU_GLOBAL_RUN_ARGS $DOKKU_RUN_OPTS "${ARG_ARRAY[@]}" $IMAGE $EXEC_CMD "$@"
+  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  plugn trigger scheduler-run "$DOKKU_SCHEDULER" "$APP" "$@"
 }
 
 dokku_run_cmd "$@"

plugins/20_events/network-clear-config

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

plugins/20_events/plugin.toml

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

plugins/20_events/post-app-clone

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

plugins/20_events/post-app-rename

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

plugins/20_events/post-extract

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

plugins/20_events/pre-restore

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

plugins/20_events/pre-start

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

plugins/20_events/proxy-clear-config

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

plugins/20_events/report

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

plugins/20_events/scheduler-deploy

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

plugins/20_events/scheduler-docker-cleanup

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

plugins/20_events/scheduler-run

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

plugins/20_events/scheduler-stop

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

plugins/20_events/scheduler-tags-create

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

plugins/20_events/scheduler-tags-destroy

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

plugins/20_events/subcommands/list

@@ -6,12 +6,12 @@ events_list_cmd() {
   declare desc="lists enabled events"
   local cmd="events:list"
   local PLUGIN_DIR="$(dirname "$0")/.."
+  local logged hook
 
   if [[ "$DOKKU_EVENTS" ]]; then
-    local logged="$(find "$PLUGIN_DIR" -type l -printf '%f ' 2>/dev/null | sort)"
+    logged="$(find "$PLUGIN_DIR" -type l -printf '%f\n' 2>/dev/null | sort -n)"
     dokku_col_log_info2_quiet "Events currently logged"
 
-    local hook
     for hook in $logged; do
       dokku_col_log_msg "$hook"
     done

plugins/20_events/uninstall

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

plugins/apps/functions

@@ -8,16 +8,18 @@ apps_create() {
   declare APP="$1"
   is_valid_app_name "$APP"
 
-  [[ -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "Name is already taken"
+  apps_exists "$APP" > /dev/null 2>&1 && dokku_log_fail "Name is already taken"
 
   mkdir -p "$DOKKU_ROOT/$APP"
-  echo "Creating $APP... done"
+  dokku_log_info1_quiet "Creating $APP... done"
   plugn trigger post-create "$APP"
 }
 
 apps_destroy() {
-  local APP="$1"; local IMAGE_TAG=$(get_running_image_tag "$APP")
+  declare desc="destroys an app"
+  declare APP="$1";
   verify_app_name "$APP"
+  local IMAGE_TAG=$(get_running_image_tag "$APP")
 
   if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
     dokku_log_warn "WARNING: Potentially Destructive Action"
@@ -32,20 +34,33 @@ apps_destroy() {
   fi
 
   echo "Destroying $APP (including all add-ons)"
-
   plugn trigger pre-delete "$APP" "$IMAGE_TAG"
-  local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
-  local DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
-  [[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
-
-  if [[ -n $DOKKU_APP_CIDS ]]; then
-    local cid
-    for cid in $DOKKU_APP_CIDS; do
-      # shellcheck disable=SC2086
-      docker stop $DOCKER_STOP_TIME_ARG "$cid" > /dev/null || true
-      docker rm "$cid"  > /dev/null || true
-    done
-  fi
 
+  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local REMOVE_CONTAINERS="true"
+  plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP" "$REMOVE_CONTAINERS"
   plugn trigger post-delete "$APP" "$IMAGE_TAG"
 }
+
+apps_exists() {
+  declare desc="checks if an app exists"
+  declare APP="$1"
+  is_valid_app_name "$APP"
+
+  [[ -d "$DOKKU_ROOT/$APP" ]] || return 1
+}
+
+apps_maybe_create() {
+  declare desc="creates an app dir if allowed"
+  declare APP="$1"
+
+  if ! apps_exists "$APP" > /dev/null 2>&1; then
+    DOKKU_GLOBAL_DISABLE_AUTOCREATE="$(config_get --global DOKKU_DISABLE_APP_AUTOCREATION || true)"
+    if [[ "$DOKKU_GLOBAL_DISABLE_AUTOCREATE" == "true" ]]; then
+      dokku_log_warn "App auto-creation disabled."
+      dokku_log_fail " !     Re-enable app auto-creation or create an app with 'dokku apps:create ${APP}'"
+    else
+      suppress_output apps_create "$APP"
+    fi
+  fi
+}

plugins/apps/internal-functions

@@ -1,6 +1,81 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/functions"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+cmd-apps-report() {
+  declare desc="displays the app report for one or more apps"
+  local cmd="apps:report"
+  local INSTALLED_APPS=$(dokku_apps)
+  local APP="$2" INFO_FLAG="$3"
+
+  if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
+    INFO_FLAG="$APP"
+    APP=""
+  fi
+
+  if [[ -z "$APP" ]] && [[ -z "$INFO_FLAG" ]]; then
+    INFO_FLAG="true"
+  fi
+
+  if [[ -z "$APP" ]]; then
+    for app in $INSTALLED_APPS; do
+      cmd-apps-report-single "$app" "$INFO_FLAG" | tee || true
+    done
+  else
+    cmd-apps-report-single "$APP" "$INFO_FLAG"
+  fi
+}
+
+cmd-apps-report-single() {
+  declare APP="$1" INFO_FLAG="$2"
+  local APP_DIR="$DOKKU_ROOT/$APP"
+  local use_echo;
+  if [[ "$INFO_FLAG" == "true" ]]; then
+    use_echo=true
+    INFO_FLAG=""
+  fi
+  verify_app_name "$APP"
+  local flag_map=(
+    "--app-dir: $APP_DIR"
+    "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2> /dev/null || false)"
+    "--deploy-source: $(: | plugn trigger deploy-source "$APP")"
+    "--locked: $(apps_is_locked "$APP")"
+  )
+
+  if [[ -z "$INFO_FLAG" ]]; then
+    dokku_log_info2_quiet "$APP app information"
+    if (is_deployed "$APP"); then
+      for flag in "${flag_map[@]}"; do
+        key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
+        dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")"
+      done
+    else
+      if [[ "$use_echo" ]]; then
+        echo "not deployed"
+      else
+        dokku_log_fail "not deployed"
+      fi
+    fi
+  else
+    local match=false; local value_exists=false
+    for flag in "${flag_map[@]}"; do
+      valid_flags="${valid_flags} $(echo "$flag" | cut -d':' -f1)"
+      if [[ "$flag" == "${INFO_FLAG}:"* ]]; then
+        value=${flag#*: }
+        size="${#value}"
+        if [[ "$size" -ne 0 ]]; then
+          echo "$value" && match=true && value_exists=true
+        else
+          match=true
+        fi
+      fi
+    done
+    [[ "$match" == "true" ]] || dokku_log_fail "Invalid flag passed, valid flags:${valid_flags}"
+    [[ "$value_exists" == "true" ]] || dokku_log_fail "not deployed"
+  fi
+}
+
 
 apps_help_content_func() {
   declare desc="return apps plugin help content"
@@ -10,8 +85,10 @@ apps_help_content_func() {
     apps:create <app>, Create a new app
     apps:destroy <app>, Permanently destroy an app
     apps:list, List your apps
+    apps:lock <app>, Creates a '.deploy.lock' file in an application's repo
     apps:rename <old-app> <new-app>, Rename an app
     apps:report [<app>] [<flag>], Display report about an app
+    apps:unlock <app>, Removes the '.deploy.lock' file from an application's repo
 help_content
 }
 
@@ -49,3 +126,15 @@ apps_list_cmd() {
     echo "$app"
   done
 }
+
+apps_is_locked() {
+  declare desc="check if an app is locked"
+  declare APP="$1"
+  local LOCKED=false
+
+  if [[ -f "$DOKKU_ROOT/$APP/.deploy.lock" ]]; then
+    LOCKED=true
+  fi
+
+  echo "$LOCKED"
+}

plugins/apps/plugin.toml

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

plugins/apps/post-delete

@@ -13,9 +13,6 @@ app_post_delete() {
     rm -rf "${DOKKU_ROOT:?}/$APP" > /dev/null
   fi
 
-  # remove all application containers & images
-  # shellcheck disable=SC2046
-  docker rm -f $(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs) &>/dev/null || true
   # shellcheck disable=SC2046
   docker rmi $(docker images -q "$IMAGE_REPO" | xargs) &>/dev/null || true
 }

plugins/apps/pre-delete

@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 apps_pre_delete() {
   declare desc="apps pre-delete plugin trigger"
   local trigger="apps_pre_delete"
-  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"; local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
   verify_app_name "$APP"
 
   if ! is_image_herokuish_based "$IMAGE"; then
@@ -13,7 +13,7 @@ apps_pre_delete() {
   fi
 
   if [[ -d $CACHE_DIR ]]; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
   fi
 }
 

plugins/apps/report

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

plugins/apps/subcommands/clone

@@ -6,19 +6,34 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 apps_clone_cmd() {
   declare desc="clones an app"
-  declare OLD_APP="$2" NEW_APP="$3"
-  local cmd="apps:clone"
+  declare cmd="apps:clone" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare OLD_APP="$1" NEW_APP="$2"
+  local IGNORE_EXISTING=false
   local SKIP_REBUILD=false
 
-  if [[ "$2" == "--skip-deploy" ]]; then
-    SKIP_REBUILD=true
-    OLD_APP="$3"
-    NEW_APP="$4"
+  for arg in "$@"; do
+    [[ "$arg" == "--skip-deploy" ]] && shift 1 && SKIP_REBUILD=true
+    [[ "$arg" == "--ignore-existing" ]] && shift 1 && IGNORE_EXISTING=true
+    [[ "$arg" =~ ^--.* ]] || break
+  done
+
+  OLD_APP="$1" NEW_APP="$2"
+  [[ -z "$OLD_APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+
+  is_valid_app_name "$OLD_APP"
+  is_valid_app_name "$NEW_APP"
+  apps_exists "$OLD_APP" > /dev/null 2>&1 || dokku_log_fail "App does not exist"
+  if apps_exists "$NEW_APP" > /dev/null 2>&1; then
+    if [[ "$IGNORE_EXISTING" == true ]]; then
+      dokku_log_warn "Name is already taken"
+      return
+    fi
+
+    dokku_log_fail "Name is already taken"
   fi
 
-  [[ -z "$OLD_APP" ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ -d "$DOKKU_ROOT/$NEW_APP" ]] && dokku_log_fail "Name is already taken"
   local NEW_CACHE_DIR="$DOKKU_ROOT/$NEW_APP/cache"
+  local NEW_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$NEW_APP/cache"
 
   apps_create "$NEW_APP"
   pushd "$DOKKU_ROOT/$OLD_APP/." > /dev/null
@@ -26,7 +41,7 @@ apps_clone_cmd() {
   popd > /dev/null 2>&1 || pushd "/tmp" > /dev/null
 
   if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   fi
   rm -rf "$NEW_CACHE_DIR"
 

plugins/apps/subcommands/exists

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/apps/functions"
+
+apps_exists_cmd() {
+  declare desc="checks if an app exists"
+  local cmd="apps:exists"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  if ! apps_exists "$APP"; then
+    dokku_log_fail "App does not exist"
+  fi
+  dokku_log_info1 "App already exists"
+}
+
+apps_exists_cmd "$@"

plugins/apps/subcommands/lock

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
+
+apps_lock_cmd() {
+  declare desc="creates a '.deploy.lock' file in an application's repo"
+  declare cmd="apps:lock"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"; verify_app_name "$APP"
+
+  touch "$DOKKU_ROOT/$APP/.deploy.lock" || dokku_log_fail "Unable to create deploy lock"
+
+  dokku_log_info1 "Deploy lock created"
+}
+
+apps_lock_cmd "$@"

plugins/apps/subcommands/rename

@@ -12,13 +12,15 @@ apps_rename_cmd() {
   local OLD_APP="$2"
   local NEW_APP="$3"
   local OLD_CACHE_DIR="$DOKKU_ROOT/$OLD_APP/cache"
+  local OLD_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$OLD_APP/cache"
 
-  if [[ -d "$OLD_CACHE_DIR" ]] && ! rmdir "$OLD_CACHE_DIR"; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+  if [[ -d "$OLD_CACHE_DIR" ]] && ! rmdir "$OLD_CACHE_DIR" > /dev/null 2>&1; then
+    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   fi
   rm -rf "$OLD_CACHE_DIR"
   apps_create "$NEW_APP"
   cp -a "$DOKKU_ROOT/$OLD_APP/." "$DOKKU_ROOT/$NEW_APP"
+  plugn trigger proxy-clear-config "$NEW_APP"
   DOKKU_APPS_FORCE_DELETE=1 apps_destroy "$OLD_APP"
   [[ -f "$DOKKU_ROOT/$NEW_APP/URLS" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS"
   [[ -f "$DOKKU_ROOT/$NEW_APP/VHOST" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST"

plugins/apps/subcommands/report

@@ -1,92 +1,5 @@
 #!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
-report_single_app() {
-  declare APP="$1" INFO_FLAG="$2"
-  local APP_DIR="$DOKKU_ROOT/$APP"
-  local use_echo;
-  if [[ "$INFO_FLAG" == "true" ]]; then
-    use_echo=true
-    INFO_FLAG=""
-  fi
-  verify_app_name "$APP"
-  local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
-  if [[ -n $DOKKU_APP_CIDS ]]; then
-    local cid
-    for CID in $DOKKU_APP_CIDS; do
-      local APP_CONTAINER_STATUS
-      local DOKKU_APP_CID
-      DOKKU_APP_CID=$CID
-      APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID")
-    done
-  fi
-  local flag_map=(
-    "--app-dir: $APP_DIR"
-    "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2> /dev/null || false)"
-    "--app-cid: ${DOKKU_APP_CID:0:12}"
-    "--status: $APP_CONTAINER_STATUS"
-  )
-
-  if [[ -z "$INFO_FLAG" ]]; then
-    dokku_log_info2_quiet "$APP app information"
-    if (is_deployed "$APP"); then
-      for flag in "${flag_map[@]}"; do
-        key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
-        dokku_log_verbose "$(printf "%-20s %-25s" "${key^}" "${flag#*: }")"
-      done
-    else
-      if [[ "$use_echo" ]]; then
-        echo "not deployed"
-      else
-        dokku_log_fail "not deployed"
-      fi
-    fi
-  else
-    local match=false; local value_exists=false
-    for flag in "${flag_map[@]}"; do
-      valid_flags="${valid_flags} $(echo "$flag" | cut -d':' -f1)"
-      if [[ "$flag" == "${INFO_FLAG}:"* ]]; then
-        value=${flag#*: }
-        size="${#value}"
-        if [[ "$size" -ne 0 ]]; then
-          echo "$value" && match=true && value_exists=true
-        else
-          match=true
-        fi
-      fi
-    done
-    if [[ "$match" == "true" ]]; then
-      [[ "$value_exists" == "true" ]] || dokku_log_fail "not deployed"
-    else
-      dokku_log_fail "Invalid flag passed, valid flags:${valid_flags}"
-    fi
-  fi
-}
-
-apps_report_cmd() {
-  declare desc="displays the app report for one or more apps"
-  local cmd="apps:report"
-  local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
-
-  if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
-    INFO_FLAG="$APP"
-    APP=""
-  fi
-
-  if [[ -z "$APP" ]] && [[ -z "$INFO_FLAG" ]]; then
-    INFO_FLAG="true"
-  fi
-
-  if [[ -z "$APP" ]]; then
-    for app in $INSTALLED_APPS; do
-      report_single_app "$app" "$INFO_FLAG" | tee || true
-    done
-  else
-    report_single_app "$APP" "$INFO_FLAG"
-  fi
-}
-
-apps_report_cmd "$@"
+cmd-apps-report "$@"

plugins/apps/subcommands/unlock

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
+
+apps_unlock_cmd() {
+  declare desc="removes the '.deploy.lock' file from an application's repo"
+  declare cmd="apps:unlock"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"; verify_app_name "$APP"
+
+  if [[ -f "$DOKKU_ROOT/$APP/.deploy.lock" ]]; then
+  	dokku_log_warn "A deploy may be in progress."
+  	dokku_log_warn "Removing the application lock will not stop in progress deploys."
+  fi
+
+  rm -f "$DOKKU_ROOT/$APP/.deploy.lock" || dokku_log_fail "Unable to remove deploy lock"
+
+  dokku_log_info1 "Deploy lock removed."
+}
+
+apps_unlock_cmd "$@"

plugins/build-env/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.11.4"
+version = "0.12.11"
 [plugin.config]

plugins/build-env/pre-build-buildpack

@@ -13,7 +13,7 @@ build_env_pre_build_buildpack() {
   IMAGE=$(get_app_image_name "$APP");
 
   [[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=90
-  [[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=60
+  [[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=600
 
   dokku_log_info1 "Adding BUILD_ENV to build environment..."
   # create build env files for use in buildpacks like this: