Release 0.12.2

# History

## 0.12.2

### Bug Fixes

- #3155: @josegonzalez fix: re-add is_container_running

.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2
+jobs:
+  build:
+    machine: true
+    parallelism: 4
+    steps:
+      - checkout
+      - run: |
+          make ci-dependencies
+      - run: |
+          ./tests/ci/setup.sh
+      - run: |
+          echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
+      - run: |
+          # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
+          sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
+      - run: |
+          case $CIRCLE_NODE_INDEX in
+            0) sudo -E make -e lint ;;
+            1) sudo -E make -e go-tests ci-go-coverage;;
+            2) sudo -E make -e deploy-test-checks-root deploy-test-config deploy-test-multi deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
+          esac
+      - run:
+          shell: /bin/bash
+          command: sudo -E make -e test-ci
+          no_output_timeout: 60m
+      - store_artifacts:
+          path: ./coverage.out

.codacy.yml

@@ -0,0 +1,5 @@
+exclude_paths:
+- vendor/**/*
+- tests/**/*
+- "**_test.go"
+- contrib/*

.dockerignore

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

.editorconfig

@@ -17,5 +17,5 @@ indent_size = 4
 
 [*.go]
 insert_final_newline = true
-indent_style = space
+indent_style = tab
 indent_size = 4

.gitignore

@@ -2,7 +2,10 @@
 *.rpm
 .DS_Store
 .ruby-version
+.idea/
 .vagrant
 data/
 stack.tgz
 tmp
+coverage.out
+contrib/dokku-update-version

.stickler.yml

@@ -1,9 +1,10 @@
 linters:
   shellcheck:
     shell: bash
-    exclude: SC2034
+    exclude: SC2034,SC1090,SC2191
   golint:
 
 files:
     ignore:
       - './debian/*'
+      - '*/vendor/*'

HISTORY.md

@@ -1,5 +1,266 @@
 # History
 
+## 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
+
+- #3071: @josegonzalez Do not grab restart policies if the deploy phase cannot be read
+- #3065: @josegonzalez Check if dokkurc files are readable before attempting to source
+- #3066: @josegonzalez Validate that all application names are valid domain names
+- #3052: @alexquick Remove bad config keys on load from app/global envfiles
+
+### New Features
+
+- #3073: @josegonzalez Add support for rhel
+- #3039: @josegonzalez Enhance security-related upgrade process
+- #3038: @shrmnk Add ps:stopall subcommand
+- #3055: @michaelshobbs Update to herokuish v0.3.34
+- #3045: @jcrben Remove nginx configuration files on debian purge
+
+### Documentation
+
+- #3072: @josegonzalez Remove all references to VHOST files from documentation
+- #3069: @josegonzalez Remove potentially bad nginx template examples
+- #3059: @lwm Add note for runtime host configuration for checks.
+- #3041: @jcrben Point to unattended install instructions
+- #3053: @mimischi Add plugin to manage Dockerfile location to documentation
+- #3062: @shannara Change help run command be more explicit
+- #3034: @znz Fix a typo in golang config.go source
+- #3061: @tomdyson Fix plugin-triggers docs typo
+- #3056: @raine Fix typo in config help output
+- #3044: @takuti Fix links to port-management
+- #3042: @josegonzalez Improve documentation around port handling.
+
+## 0.11.3
+
+### Bug Fixes
+
+- #3031: @josegonzalez fix: ensure we respect DOKKU_DEPLOY_BRANCH when rebuilding applications
+
+### New Features
+
+- #3028: @josegonzalez Ensure parallel runs properly for non-restorable apps and moreutils parallel
+- #3030: @josegonzalez feat: allow changing the system user the properties plugin uses
+- #3024: @jcrben Use high-availability pool keyserver during tests
+- #3017: @josegonzalez feat: add pre-start trigger for notifying on application start
+
+### Documentation
+
+- #3020: @gliwka Point to docs in the right version
+- #3016: @josegonzalez Update nginx template example to use http2 when available
+
+## 0.11.2
+
+### Bug Fixes
+
+- #3014: @josegonzalez fix: handle case where DOKKU_DOCKERFILE_PORTS is an empty string
+- #3013: @alexquick Fix some issues with config/network/repo help output
+- #3012: @alexquick Fail when setting/unsetting invalid keys
+- #3011: @alexquick Forward output from plugn triggers to user
+- #3004: @josegonzalez Return/Exit 1 when an image being deployed is invalid
+
+### Documentation
+
+- #3015: @elia Tiny fixes to triggers documentation
+
+## 0.11.1
+
+### Bug Fixes
+
+- #3010: @josegonzalez fix: route config_all to the `config` command to fix datastore plugin usage
+- #3009: @josegonzalez fix: correct the guard around the config_export call in config_sub
+- #3006: @josegonzalez fix: do not allow shadowing of the CACHE_DIR variable
+- #3005: @josegonzalez fix: persist users in the dokku group through installations
+- #3003: @josegonzalez Fix issues in apps:clone calls
+- #3001: @josegonzalez fix: allow applications to begin with numeric values
+
+### New Features
+
+- #3002: @josegonzalez fix: omit redirection of docker build output
+- #3000: @josegonzalez fix: remove golang files and triggers directory for packaging
+
+## 0.11.0
+
+### Bug Fixes
+
+- #2998: @josegonzalez Fix issues in release process
+- #2993: @josegonzalez Add config_all alias for plugin usage
+- #2972: @buckle2000 Correct typo in docker-options:remove error output
+- #2964: @znz Remove unused variable
+- #2967: @znz Fix indentation in test file
+- #2963: @znz Correct typos in config plugin and remove potential infinite recursion issue
+- #2951: @josegonzalez Handle case where the app directory is a symlink
+- #2939: @znz Remove unnecessary lines
+- #2945: @znz Fix network plugin version
+- #2937: @michaelshobbs Strip restart flag from app_user_pre_deploy_trigger
+- #2931: @josegonzalez Upgrade git package for CI
+- #2928: @silverfix Do not overwrite the VHOST file during installation if it exists
+- #2926: @vtavernier Remove leading forward slash from app name in git-upload-pack
+
+### New Features
+
+- #2985: @bitmand Build a custom dhparam file once for nginx and include it as default
+- #2974: @josegonzalez Upgrade to herokuish 0.3.33
+- #2973: @josegonzalez Allow usage of git 2.13.0+ by unsetting GIT_QUARANTINE_PATH during git worktree usage
+- #2971: @miraculixx Add support for older virtualbox versions in official Dokku Vagrantfile
+- #2966: @znz Simplify internal config functions to reduce duplication
+- #2751: @alexquick Move config plugin to golang
+- #2938: @michaelshobbs Upgrade to golang 1.9.1
+- #2736: @josegonzalez Implement Network Plugin
+- #2929: @michaelshobbs Add codacy config and coverage targets
+
+### Documentation
+
+- #2935: @jcrben Document how to make herokuish optional during the bootstrap installation
+- #2982: @agorf Correct typo in user management docs
+- #2981: @agorf Correct typos in process management docs
+- #2969: @znz Correct comments on network triggers
+- #2965: @znz Remove spaces from config subcommand help output to mirror help output of other subcommands
+- #2954: @mrname Add vernemq community datastore plugin to docs
+- #2944: @axilleas Fix syntax typo in debian installation docs
+- #2932: @znz Update code comment to match documentation
+- #2933: @znz Fix version number for network binding documentation
+
+## 0.10.5
+
+### Bug Fixes
+
+- #2912: @josegonzalez Add missing depends statement for rsyslog
+- #2906: @manuel-colmenero Check the location of nginx in a central way
+- #2895: @josegonzalez cd to app directory when calling git worktree add
+
+### Documentation
+
+- #2922: @axilleas Clarify the minimum Nginx version for HTTP/2 support
+- #2919: @wootwoot1234 Update nginx documentation surrounding file uploading for php buildpack users
+- #2913: @znz Fix a typo in the rpm release script
+- #2910: @buckle2000 Add a note about using the full git url for non-compliant toolchains
+
+## 0.10.4
+
+### Bug Fixes
+
+- #2894: @josegonzalez fix: bail if any step in the release process fails
+- #2880: @josegonzalez fix: properly detect empty subcommands
+- #2881: @josegonzalez Verify app name on git push
+- #2858: @cstroe Use correct port number for the upstream.
+- #2848: @josegonzalez Ensure https applications return an https url from `dokku url`
+- #2839: @josegonzalez fix: skip clearing cache if we are not building a herokuish image
+
+### New Features
+
+- #2890: @michaelshobbs use circleci 2.0
+- #2847: @scjody Add nginx ppa before installing Dokku
+- #2850: @michaelshobbs add optional PROC_TYPE and CONTAINER_INDEX to docker-args-deploy plugn trigger
+- #2840: @josegonzalez Add DYNO environment variable to run containers
+- #2824: @josegonzalez Upgrade herokuish to version 0.3.31
+
+### Documentation
+
+- #2861: @adelq Use non-deprecated apps command
+- #2878: @m0rth1um Add telegram notifications plugin
+- #2876: @josegonzalez docs: clarify storage documentation caveats
+- #2873: @josegonzalez docs: add a note on which docs to look at for customizing nginx docs
+- #2867: @josegonzalez docs: cleanup help output for dokku shell
+- #2859: @josegonzalez docs: use relative link for application deployment doc
+- #2866: @josegonzalez Add missing migration guides
+- #2863: @josegonzalez docs: fix syntax on getting started docs
+- #2836: @fishnux Add a note regarding nginx dependency to installation docs
+- #2834: @iansu Clarify port exposure in Dockerfile documentation
+
 ## 0.10.3
 
 ### Bug Fixes

ISSUE_TEMPLATE.md

@@ -5,16 +5,7 @@ Description of problem:
 
 Output of the following commands
 
-<!-- If you're running 0.4.10+ just use dokku report-->
-
-- `uname -a`:
-- `free -m`:
-- `docker version`:
-- `docker -D info`:
-- `sigil -v`:
-- `docker run -ti gliderlabs/herokuish:latest herokuish version`:
-- `dokku version`:
-- `dokku plugin`:
+- `dokku report APP_NAME`
 - `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):

Makefile

@@ -1,6 +1,6 @@
 DOKKU_VERSION ?= master
 
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand
 PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
@@ -26,7 +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
@@ -116,7 +119,7 @@ dependencies: apt-update sshcommand plugn docker help2man man-db sigil
 	$(MAKE) -e stack
 
 apt-update:
-	apt-get update
+	apt-get update -qq
 
 help2man:
 	apt-get install -qq -y help2man

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.10.3/bootstrap.sh
-sudo DOKKU_TAG=v0.10.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh
+sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.

Vagrantfile

@@ -45,6 +45,8 @@ Vagrant::configure("2") do |config|
     vm.vm.provider :virtualbox do |vb|
       vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
       vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
+      # enable NAT adapter cable https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838999
+      vb.customize ["modifyvm", :id, "--cableconnected1", "on"]
     end
 
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
@@ -64,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
@@ -91,7 +98,7 @@ install-dokku-from-package() {
     debian|ubuntu)
       install-dokku-from-deb-package "$@"
       ;;
-    centos)
+    centos|rhel)
       install-dokku-from-rpm-package "$@"
       ;;
     *)
@@ -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 "
@@ -122,9 +140,32 @@ install-dokku-from-deb-package() {
   fi
   wget -nv -O - https://get.docker.com/ | sh
 
+  if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then
+    echo "--> Adding nginx PPA"
+    add-apt-repository -y ppa:nginx/stable
+  fi
+
+  OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
+  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

circle.yml

@@ -1,20 +0,0 @@
-machine:
-  pre:
-    - echo 'DOCKER_OPTS="-s btrfs -e lxc --userland-proxy=false"' | sudo tee -a /etc/default/docker
-    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround'
-    - sudo chmod 0755 /usr/bin/docker
-  services:
-    - docker
-dependencies:
-  cache_directories:
-    - "~/docker"
-  override:
-    - ./tests/ci/parallel_runner.sh setup: { timeout: 300 }
-    - echo "export DOKKU_SKIP_CLEANUP=true" > /home/dokku/.dokkurc/dokku_skip_cleanup
-    # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
-    - sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
-  post:
-    - sudo -E make -e lint
-test:
-  override:
-    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 3600 }

common.mk

@@ -1,4 +1,4 @@
 GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-BUILD_IMAGE := golang:1.7.5
+BUILD_IMAGE := golang:1.9.1
 
 .PHONY: build-in-docker build clean src-clean

contrib/build.Dockerfile

@@ -2,14 +2,14 @@ FROM ubuntu:14.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update
-RUN apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
+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 GOLANG_VERSION
 
 RUN wget -qO /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \
-    && tar -C /usr/local -xzf /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz
+    && tar -C /usr/local -xzf /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz \
+    && cp /usr/local/go/bin/* /usr/local/bin
 
 ARG WORKDIR=/go/src/github.com/dokku/dokku
 
@@ -27,16 +27,17 @@ ARG DOKKU_VERSION=master
 ARG DOKKU_GIT_REV
 ARG IS_RELEASE=false
 
-RUN PATH=$PATH:/usr/local/go/bin GOPATH=/go \
-    PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
+ENV GOPATH=/go
+
+RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
     DOKKU_VERSION=${DOKKU_VERSION} \
     DOKKU_GIT_REV=${DOKKU_GIT_REV} \
     IS_RELEASE=${IS_RELEASE} \
     SKIP_GO_CLEAN=true \
     make version copyfiles \
     && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
-    && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil \
-            rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil
+    && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update \
+            rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update
 
 RUN mkdir -p /data \
     && cp /tmp/*.deb /data \

contrib/dokku-installer.py

@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.10.3'
+VERSION = 'v0.12.2'
 
 hostname = ''
 try:
@@ -254,7 +254,7 @@ PAGE = """
       $.post('/setup', data)
         .done(function() {
           $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/deployment/application-deployment/";
+          window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
         })
         .fail(function(data) {
           $("#result").html("Something went wrong...")

contrib/dokku-update

@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+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
+    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"}
+export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
+export PLUGIN_ENABLED_PATH=${PLUGIN_ENABLED_PATH:="$PLUGIN_PATH/enabled"}
+export DEBIAN_FRONTEND=noninteractive
+
+dokku-log-info() {
+  declare desc="log info formatter"
+  echo "-----> $*"
+}
+
+dokku-log-verbose() {
+  declare desc="log verbose formatter"
+  echo "       $*"
+}
+
+dokku-log-warn() {
+  declare desc="log warning formatter"
+  echo " !     $*" 1>&2
+}
+
+dokku-update-plugin() {
+  declare PLUGIN_NAME="$1"
+  if [[ -d "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/.git" ]]; then
+    dokku-log-verbose "Updating $PLUGIN_NAME"
+    dokku plugin:update "$PLUGIN_NAME"
+  fi
+}
+
+main() {
+  declare COMMAND="$1"
+  local DOKKU_DISTRO PLUGIN_NAME VERSION
+
+  if [[ -f "/etc/os-release" ]]; then
+    # shellcheck disable=SC1091
+    DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
+  fi
+
+  if [[ "$COMMAND" == "version" ]] || [[ "$COMMAND" == "-v" ]]; then
+    VERSION=UNRELEASED
+    if [[ -f "/var/lib/dokku-update/VERSION" ]]; then
+      VERSION="$(cat /var/lib/dokku-update/VERSION)"
+    fi
+    echo "dokku-update ${VERSION}"
+    exit 0
+  fi
+
+  dokku-log-info "Running system updates"
+  case "$DOKKU_DISTRO" in
+    arch)
+      yaourt -Syyua
+      ;;
+    debian|ubuntu)
+      apt-get update -qq > /dev/null
+      apt-get -qq -y --force-yes dist-upgrade
+      ;;
+    centos|opensuse|rhel)
+      dokku-log-warn "Updating this operating system is not supported"
+      ;;
+    *)
+      dokku-log-warn "Updating this operating system is not supported"
+      exit 1
+      ;;
+  esac
+
+  # update all plugins
+  dokku-log-info "Updating all plugins"
+  for  PLUGIN_NAME in $(dokku plugin:list | grep enabled | awk '$1=$1' | cut -d' ' -f1); do
+    dokku-update-plugin "$PLUGIN_NAME"
+  done
+  dokku plugin:install
+
+  # rebuild all applications
+  dokku-log-info "Rebuilding all applications"
+  dokku ps:rebuildall
+
+  dokku-log-info "Waiting for old containers to stop"
+  sleep 120
+  dokku-log-info "Cleaning up"
+  dokku cleanup
+}
+
+main "$@"

contrib/release

@@ -51,6 +51,7 @@ fn-build-dokku() {
     --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
     -f "contrib/build.Dockerfile" \
     -t "$NAME" .
+  return "$?"
 }
 
 fn-extract-package() {
@@ -68,6 +69,7 @@ fn-extract-package() {
 
   log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
   docker run --rm --entrypoint cat "$NAME" "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  return "$?"
 }
 
 fn-in-array() {
@@ -127,12 +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"
+
+  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() {
@@ -271,7 +300,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
@@ -299,13 +328,15 @@ main() {
 
   fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
 
-  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION"
+  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
 
-  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb"
-  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm"
+  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
 
-  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb"
-  fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm"
+  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+
+  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"
 }

contrib/release-dokku-update

@@ -0,0 +1,158 @@
+#!/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/update-build.Dockerfile" \
+    -t dokku-update: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 dokku-update: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
+
+  [[ "$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-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() {
+  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 DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
+
+  fn-build-dokku || log-fail "Error building package"
+
+  fn-extract-package "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
+
+  fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  fn-publish-package "$IS_RELEASE" "deb" "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+
+  fn-publish-package "$IS_RELEASE" "rpm" "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+}
+
+main "$@"

contrib/update-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-dokku-update rpm-dokku-update
+
+RUN mkdir -p /data \
+    && cp /tmp/*.deb /data \
+    && cp /tmp/*.rpm /data \
+    && ls -lha /data/

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.29
+HEROKUISH_VERSION ?= 0.4.0
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
@@ -8,6 +8,12 @@ DOKKU_DESCRIPTION = 'Docker powered PaaS that helps you build and manage the lif
 DOKKU_REPO_NAME ?= dokku/dokku
 DOKKU_ARCHITECTURE = amd64
 
+DOKKU_UPDATE_DESCRIPTION = 'Binary that handles updating Dokku and related systems'
+DOKKU_UPDATE_REPO_NAME ?= dokku/dokku
+DOKKU_UPDATE_VERSION ?= 0.1.0
+DOKKU_UPDATE_ARCHITECTURE = amd64
+DOKKU_UPDATE_PACKAGE_NAME = dokku-update_$(DOKKU_UPDATE_VERSION)_$(DOKKU_UPDATE_ARCHITECTURE).deb
+
 define PLUGN_DESCRIPTION
 Hook system that lets users extend your application with plugins
 Plugin triggers are simply scripts that are executed by the system.
@@ -52,7 +58,7 @@ export PLUGN_DESCRIPTION
 export SIGIL_DESCRIPTION
 export SSHCOMMAND_DESCRIPTION
 
-.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-plugn deb-setup deb-sshcommand deb-sigil
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-plugn deb-setup deb-sshcommand deb-sigil
 
 install-from-deb:
 	@echo "--> Initial apt-get update"
@@ -64,11 +70,11 @@ 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
 
-deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil
+deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update
 	mv /tmp/*.deb .
 	@echo "Done"
 
@@ -87,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 1> /dev/null' >> /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:
@@ -150,6 +158,21 @@ endif
 	dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
 	lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
 
+deb-dokku-update:
+	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
+	echo "${DOKKU_UPDATE_VERSION}" > contrib/dokku-update-version
+	sudo fpm -t deb -s dir -n dokku-update \
+			 --version $(DOKKU_UPDATE_VERSION) \
+			 --architecture $(DOKKU_UPDATE_ARCHITECTURE) \
+			 --package $(DOKKU_UPDATE_PACKAGE_NAME) \
+			 --depends 'dokku' \
+			 --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \
+			 --description $(DOKKU_UPDATE_DESCRIPTION) \
+			 --license 'MIT License' \
+			 contrib/dokku-update=/usr/local/bin/dokku-update \
+			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION
+	mv *.deb /tmp
+
 deb-plugn:
 	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin

debian/control

@@ -1,10 +1,10 @@
 Package: dokku
-Version: 0.10.3
+Version: 0.12.2
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.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
-Recommends: herokuish (>= 0.3.4), parallel
+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
+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>
 Description: Docker-powered PaaS that helps build and manage the lifecycle of applications

debian/lintian-overrides

@@ -3,3 +3,10 @@ dokku: maintainer-script-calls-systemctl postinst:87
 dokku: changelog-file-missing-in-native-package
 dokku: statically-linked-binary
 dokku: unstripped-binary-or-object
+
+# The Go compiler is currently unable to produce read-only relocations
+# (it produces static binaries).
+dokku: hardening-no-relro
+
+# Built golang binaries link to libc
+dokku: missing-dependency-on-libc

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}"
 
@@ -100,12 +105,15 @@ case "$1" in
       exit 0
     fi
 
-    db_get "dokku/vhost_enable"
-    if [ "$RET" = "true" ]; then
-        db_get "dokku/hostname"
-        echo "$RET" > "${DOKKU_ROOT}/VHOST"
+    if [ -f "${DOKKU_ROOT}/VHOST" ]; then
+      echo "VHOST file detected, skipping modification"
     else
-        rm -f "${DOKKU_ROOT}/VHOST"
+      db_get "dokku/vhost_enable"
+      if [ "$RET" = "true" ]; then
+          db_get "dokku/hostname"
+          echo "Setting VHOST contents to $RET"
+          echo "$RET" > "${DOKKU_ROOT}/VHOST"
+      fi
     fi
 
     db_get "dokku/hostname"

debian/postrm

@@ -24,6 +24,8 @@ main() {
   (nginx -t && service nginx reload) || true
 
   if [[ "$1" == "purge" ]]; then
+    rm -f /etc/nginx/conf.d/dokku.conf
+    rm -f /etc/nginx/conf.d/dokku-installer.conf
     rm -f ${DOKKU_ROOT}/.dokkurc ${DOKKU_ROOT}/dokkurc ${DOKKU_ROOT}/tls
     rm -f ${DOKKU_ROOT}/.ssh/authorized_keys ${DOKKU_ROOT}/.sshcommand
     rm -f ${DOKKU_ROOT}/ENV ${DOKKU_ROOT}/HOSTNAME ${DOKKU_ROOT}/VERSION

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

@@ -14,9 +14,19 @@ storage:unmount <app> <host-dir:container-dir> # Remove an existing bind mount
 
 > The storage plugin is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy/run phase.
 
-## Ideology and Background
+The storage plugin supports the following mount points:
 
-The storage plugin requires explicit paths on the host side. This is intentional to ensure that new users avoid running into unexpected results with implicit paths that may not exist (a feature deprecated in [Docker 1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0])). The container directory is created for the mount point in the container. Any existing directory contents are not accessible after a mount is added to the container. Dokku creates a new directory `/var/lib/dokku/data/storage` during installation, it's the general consensus that new users should use this directory. Mounts are only available at run and deploy times, you must redeploy (restart) an app to mount or unmount to an existing app's container.
+- explicit paths that exist on the host
+- docker volumes
+
+There are a few caveats to using the persistent storage plugin:
+
+- Using implicit paths that do not exist are no longer supported, and actually deprecated in [Docker 1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0). When you specify a persistent storage mount, the host directory is **not** autocreated by either Dokku or Docker.
+- We recommend using the directory `/var/lib/dokku/data/storage` directory as the root host path for mounts, and we create this on Dokku installation.
+- Mounts are only available at run and deploy times, and you **must** redeploy (restart) an app to mount or unmount to an existing app's container.
+- When a directory is mounted, any existing files within the container will be overwritten. If you are writing assets during the build process and then replace the directory with a mount, those files will no longer exist. This is a Docker limitation.
+- Paths are mounted within the container at the root of the disk - `/` - and are **not** relative to `/app` (for buildpacks deploys) or the `WORKDIR` (for Dockerfile/Docker images).
+- For applications using buildpack deploys, the host directory should be owned by the user and group id `32767`. This is due to how permissions within Herokuish - which builds the Docker images - works. For Dockerfile or Docker image deployments, please use the user and group id which corresponds to the one running the process within the container.
 
 ## Usage
 
@@ -45,7 +55,8 @@ mkdir -p  /var/lib/dokku/data/storage/node-js-app
 # ensure the proper user has access to this directory
 chown -R dokku:dokku /var/lib/dokku/data/storage/node-js-app
 
-# as of 0.7.x, you should chown using the `32767` user and group id
+# as of 0.7.x, you should chown using the `32767` user and group id for buildpack deploys
+# For dockerfile deploys, substitute the user and group id in use within the image
 chown -R 32767:32767 /var/lib/dokku/data/storage/node-js-app
 
 # mount the directory into your container's /app/storage directory, relative to root

docs/advanced-usage/plugin-management.md

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

docs/advanced-usage/proxy-management.md

@@ -1,206 +0,0 @@
-# Proxy Management
-
-> New as of 0.5.0, Enhanced in 0.6.0
-
-```
-proxy:disable <app>                      # Disable proxy for app
-proxy:enable <app>                       # Enable proxy for app
-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-clear <app>                  # Clear all proxy port mappings for app
-proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Unset proxy port mappings for app
-proxy:report [<app>] [<flag>]            # Displays a proxy report for one or more apps
-proxy:set <app> <proxy-type>             # Set proxy type for app
-```
-
-In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
-
-## Usage
-
-### Container network interface binding
-
-> New as of 0.5.0
-
-By default, the deployed docker container running your app's web process will bind to the internal docker network interface (i.e. `docker inspect --format '{{ .NetworkSettings.IPAddress }}' $CONTAINER_ID`). This behavior can be modified per app by disabling the proxy (i.e. `dokku proxy:disable <app>`). In this case, the container will bind to an external interface (i.e. `0.0.0.0`) and your app container will be directly accessible by other hosts on your network.
-
-> If a proxy is disabled, Dokku will bind your container's port to a random port on the host for every deploy, e.g. `0.0.0.0:32771->5000/tcp`.
-
-By way of example, in the default case, each container is bound to the docker interface:
-
-```shell
-docker ps
-```
-
-```
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS               NAMES
-1b88d8aec3d1        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute                       node-js-app.web.1
-```
-
-As such, the container's IP address will be an internal IP, and thus it is only accessible on the host itself:
-
-```
-docker inspect --format '{{ .NetworkSettings.IPAddress }}' node-js-app.web.1
-```
-
-```
-172.17.0.6
-```
-
-However, you can disable the internal proxying via the `proxy:disable` command so that it will listen on the host's IP address:
-
-```shell
-dokku proxy:disable node-js-app
-
-# container bound to all interfaces
-docker ps
-```
-
-```
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS                     NAMES
-d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   node-js-app.web.1
-```
-
-### Displaying proxy reports about an app
-
-> New as of 0.8.1
-
-You can get a report about the app's proxy status using the `proxy:report` command:
-
-```shell
-dokku proxy:report
-```
-
-```
-=====> node-js-app proxy information
-       Proxy enabled:       true
-       Proxy type:          nginx
-       Proxy port map:      http:80:5000 https:443:5000
-=====> python-sample proxy information
-       Proxy enabled:       true
-       Proxy type:          nginx
-       Proxy port map:      http:80:5000
-=====> ruby-sample proxy information
-       Proxy enabled:       true
-       Proxy type:          nginx
-       Proxy port map:      http:80:5000
-```
-
-You can run the command for a specific app also.
-
-```shell
-dokku proxy:report node-js-app
-```
-
-```
-=====> node-js-app proxy information
-       Proxy enabled:       true
-       Proxy type:          nginx
-       Proxy port map:      http:80:5000 https:443:5000
-```
-
-You can pass flags which will output only the value of the specific information you want. For example:
-
-```shell
-dokku proxy:report node-js-app --proxy-type
-```
-
-### Proxy port mapping
-
-> New as of 0.6.0
-
-You can now configure `host -> container` port mappings with the `proxy:ports-*` commands. This mapping is currently supported by the built-in nginx-vhosts plugin.
-
-To inspect the port mapping for a given application, use the `proxy:ports` command:
-
-```shell
-dokku proxy:ports node-js-app
-```
-
-```
------> Port mappings for node-js-app
------> scheme             host port                 container port
-http                      80                        5000
-```
-
-The above application is listening on the host's port `80`, which we can test via curl:
-
-```shell
-curl http://node-js-app.dokku.me
-```
-
-```
-Hello World!
-```
-
-There are cases where we may wish for the service to be listening on more than one port, such as port 8080. Normally, this would not be possible:
-
-```shell
-curl http://node-js-app.dokku.me:8080
-```
-
-```
-curl: (7) Failed to connect to node-js-app.dokku.me port 8080: Connection refused
-```
-
-However, we can use the `proxy:ports-add` command to add a second external port mapping - `8080` - to our application's port `5000`.
-
-```shell
-dokku proxy:ports-add 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
-```
-
-We can now test that port 80 still responds properly:
-
-```shell
-curl http://node-js-app.dokku.me
-```
-
-```
-Hello World!
-```
-
-And our new listening port of `8080` also works:
-
-```shell
-curl http://node-js-app.dokku.me:8080
-```
-
-```
-Hello World!
-```
-
-You can also remove a port mapping that is no longer necessary:
-
-```shell
-dokku proxy:ports-remove node-js-app http:80:5000
-```
-
-By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
-
-> Note: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.
-
-#### Proxy Port Scheme
-
-The proxy port scheme is as follows:
-
-- `SCHEME:HOST_PORT:CONTAINER_PORT`
-
-The scheme metadata can be used by proxy implementations in order to properly handle proxying of requests. For example, the built-in `nginx-vhosts` proxy implementation supports both the `http` and `https` schemes.
-
-Developers of proxy implementations are encouraged to use whatever schemes make the most sense, and ignore configurations which they do not support. For instance, a `udp` proxy implementation can safely ignore `http` and `https` port mappings.
-
-To change the proxy implementation in use for an application, use the `proxy:set` command:
-
-```shell
-# no validation will be performed against
-# the specified proxy implementation
-dokku proxy:set node-js-app nginx
-```

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

@@ -0,0 +1,31 @@
+# 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-run`
+- `scheduler-stop`
+- `scheduler-tags-create`
+- `scheduler-tags-destroy`

docs/appendices/0.10.0-migration-guide.md

@@ -0,0 +1,13 @@
+# 0.10.0 Migration Guide
+
+## PCI Compliance
+
+By default, Dokku will ship a PCI Compliant nginx configuration. For developers whose users are on older browsers or mobile devices, you may need to ship a custom `nginx.conf.sigil` to enable ciphers for older browsers.
+
+See the [nginx customization](/docs/configuration/nginx/#customizing-the-nginx-configuration) docs for more details.
+
+## Nginx Error Pages
+
+We now ship with nicer error pages by default. You are free to customize your Dokku installation via a custom `nginx.conf.sigil` to change what error pages are displayed in different circumstances.
+
+See the [nginx customization](/docs/configuration/nginx/#customizing-the-nginx-configuration) docs for more details.

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/appendices/0.8.0-migration-guide.md

@@ -0,0 +1,19 @@
+# 0.8.0 Migration Guide
+
+## Domain Management
+
+You can now set global and app domains via `domains:set` and `domains:set-global`. See the [domains documentation](/docs/configuration/domains/) for more details.
+
+## Plugin Uninstallation
+
+A new `uninstall` plugin trigger was introduced. This functionality may be in use for newer plugins, so be aware that older Dokku versions may require manual cleanup.
+
+See the [uninstall trigger documentation](/docs/development/plugin-triggers/#uninstall) for implementation instructions.
+
+## Deployment Tasks
+
+Should a pre or post deployment task fail, we now fail the entire deploy.
+
+## Nginx HTTP2 Support
+
+Due to bugs in Nginx, the minimum version for HTTP2 is now 1.11.5.

docs/appendices/0.9.0-migration-guide.md

@@ -0,0 +1,12 @@
+# 0.9.0 Migration Guide
+
+## Golang Migration
+
+There is an ongoing migration to rewrite Dokku in Golang. The reasons are beyond the scope of this document, but this may impact any patches you have for Dokku. As of 0.9.0, only the `repo` plugin is in Golang.
+
+The following shall remain true, regardless of the state of our rewrite:
+
+- You will be able to write custom plugins in any language.
+- You will be able to enable or disable core plugins.
+- `plugn` will continue to be used for executing plugin triggers.
+- We will provide bash wrappers that can be sourced to execute core functionality that is implemented in golang.

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.10.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/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,23 +35,32 @@ 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.10.3/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.2/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;
@@ -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,6 +148,7 @@ h1 {
 }
 .alternate-instructions {
   display: block;
+  font-size: 1.6em;
   line-height: 1.3em;
   margin: 45px auto;
   max-width: 750px;
@@ -166,10 +179,11 @@ h1 {
 }
 .slack-channel {
   background-color: #EEF1F7;
-  font-size: 16px;
+  font-size: 1.6em;
   font-weight: 300;
   margin-bottom: 2.5em;
-  padding: 2.5em 0;
+  padding-top: 2.5em;
+  padding-bottom: 2.5em;
   text-align: center
 }
 .slack-channel .inline-container {
@@ -198,7 +212,7 @@ h1 {
 }
 .team-members .fund-link {
   display: block;
-  font-size: 80%;
+  font-size: .8em;
 }
 .team-member {
   min-height: 320px;
@@ -209,7 +223,7 @@ h1 {
 
 .list-group-item {
   border: none;
-  font-size: 14px;
+  font-size: 1.1em;
   font-weight: normal;
   padding: .2rem .5rem;
   color: #157577;
@@ -230,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;
 }
@@ -245,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;
@@ -253,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;
@@ -294,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;
@@ -318,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;
@@ -366,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
 }
@@ -414,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;
 }
@@ -432,7 +450,6 @@ blockquote {
 .icon-improve {
   color: #bdbdb5;
   padding: 2px 9px 0 10px;
-  font-size: 14px;
 }
 a .fa {
   display: inline-block;
@@ -583,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;
 }
@@ -609,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

@@ -7,6 +7,8 @@
     "0.7.2", 
     "0.8.2", 
     "0.9.4", 
-    "0.10.3"
+    "0.10.5", 
+    "0.11.6", 
+    "0.12.2"
   ]
 }

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
@@ -89,6 +89,7 @@ Note: The following plugins have been supplied by our community and may not have
 [Kloadut]: https://github.com/Kloadut
 [krisrang]: https://github.com/krisrang
 [luxifer]: https://github.com/luxifer
+[m0rth1um]: https://github.com/m0rth1um
 [Maciej Łebkowski]: https://github.com/mlebkowski
 [matto1990]: https://github.com/matto1990
 [mbreit]: https://github.com/mbreit
@@ -96,9 +97,11 @@ Note: The following plugins have been supplied by our community and may not have
 [michaelshobbs]: https://github.com/michaelshobbs
 [mikecsh]: https://github.com/mikecsh
 [mikexstudios]: https://github.com/mikexstudios
+[mimischi]: https://github.com/mimischi
 [mixxorz]: https://github.com/mixxorz
 [mlebkowski]: https://github.com/mlebkowski
 [motin]: https://github.com/motin
+[mrname]: https://github.com/mrname
 [musicglue]: https://github.com/musicglue
 [neam]: https://github.com/neam
 [nickcharlton]: https://github.com/nickcharlton
@@ -122,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
 
@@ -151,6 +155,7 @@ Note: The following plugins have been supplied by our community and may not have
 | [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin)                                   | [jlachowski][]        | 0.3.x                 |
 | [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin)         | [jlachowski][]        | 0.3.x                 |
 | [ElasticMQ (SQS compatible)](https://github.com/cu12/dokku-elasticmq)                             | [cu12][]              | 0.5.0+                |
+| [VerneMQ (MQTT Broker)](https://github.com/SpinifexGroup/dokku-vernemq)                           | [mrname][]            | 0.4.0+                |
 
 #### Other
 
@@ -173,9 +178,9 @@ Note: The following plugins have been supplied by our community and may not have
 | [Docker Direct](https://github.com/josegonzalez/dokku-docker-direct)                              | [josegonzalez][]      | 0.4.0+                |
 | [Dokku Clone](https://github.com/crisward/dokku-clone)                                            | [crisward][]          | 0.4.0+                |
 | [Dokku Copy App Config Files](https://github.com/josegonzalez/dokku-supply-config)                | [josegonzalez][]      | 0.4.0+                |
+| [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+                |
@@ -214,7 +219,9 @@ 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+                |
 | [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
 | [Monorepo](https://github.com/iamale/dokku-monorepo)                                              | [iamale][]            | 0.4.0+                |
@@ -222,6 +229,7 @@ Note: The following plugins have been supplied by our community and may not have
 | [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         | 0.3.x                 |
 | [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+                |
 | [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             | 0.4.0+                |
+| [Telegram Notifications](https://github.com/m0rth1um/dokku-telegram)                              | [m0rth1um][]          | 0.4.0+                |
 | [Tor](https://github.com/michaelshobbs/dokku-tor)                                                 | [michaelshobbs][]     | 0.4.0+                |
 | [User ACL](https://github.com/dokku-community/dokku-acl)                                          | [Maciej Łebkowski][]  | 0.4.0+                |
 | [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      | 0.3.x                 |
@@ -241,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/run-on-external-volume.md

@@ -0,0 +1,75 @@
+# 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.
+
+## 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
 
@@ -25,9 +25,9 @@ Applications typically have the following structure for their hostname:
 scheme://subdomain.domain.tld
 ```
 
-The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial configuration and stored in the `$DOKKU_ROOT/VHOST` file. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
+The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial dokku configuration. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
 
-If a FQDN such as `other.tld` is used as the application name, the default `$DOKKU_ROOT/VHOST` will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+If a FQDN such as `other.tld` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
 
 You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
 
@@ -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:

docs/configuration/environment-variables.md

@@ -5,10 +5,11 @@ 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 (<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
 ```
 
 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).
@@ -23,10 +24,15 @@ You can set multiple environment variables at once:
 dokku config:set node-js-app ENV=prod COMPILE_ASSETS=1
 ```
 
-When setting variables with whitespaces, you need to escape them:
+> Note: Whitespace and special characters get tricky. If you are using dokku locally you don't need to do any special escaping. If you are using dokku over ssh you will need to backslash-escape spaces:
+```shell
+dokku config:set node-js-app KEY="VAL\ WITH\ SPACES"
+```
+
+Dokku can also read base64 encoded values. That's the easiest way to set a value with newlines or spaces. To set a value with newlines you need to base64 encode it first and pass the `--encoded` flag:
 
 ```shell
-dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
+dokku config:set --encoded node-js-app KEY="$(base64 ~/.ssh/id_rsa)"
 ```
 
 When setting or unsetting environment variables, you may wish to avoid an application restart. This is useful when developing plugins or when setting multiple environment variables in a scripted manner. To do so, use the `--no-restart` flag:
@@ -35,23 +41,24 @@ When setting or unsetting environment variables, you may wish to avoid an applic
 dokku config:set --no-restart node-js-app ENV=prod
 ```
 
-If you wish to have the variables output in an `eval`-compatible form, you can use the `--export` flag:
+If you wish to have the variables output in an `eval`-compatible form, you can use the `config:export` command
 
 ```shell
-dokku config node-js-app --export
+dokku config:export node-js-app
 # outputs variables in the form:
 #
 #   export ENV='prod'
 #   export COMPILE_ASSETS='1'
 
 # source in all the node-js-app app environment variables
-eval $(dokku config node-js-app --export)
+eval $(dokku config:export node-js-app)
 ```
 
-You can also output the variables in a single-line for usage in command-line utilities with the `--shell` flag:
+You can control the format of the exported variables with the `--format` flag. 
+`--format=shell` will output the variables in a single-line for usage in command-line utilities:
 
 ```shell
-dokku config node-js-app --shell
+dokku config:export --format shell node-js-app
 
 # outputs variables in the form:
 #
@@ -85,6 +92,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`                                                                                                                            | |
@@ -93,19 +101,22 @@ 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. |
 | `DOKKU_SKIP_DEFAULT_CHECKS`    |                                 | `dokku config:set`                                                                                                                               | |
 | `DOKKU_SKIP_DEPLOY`            |                                 | `dokku config:set`                                                                                                                               | |
-| `DOKKU_WAIT_TO_RETIRE`         | `60`                            | `dokku config:set`                                                                                                                               | After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running http connections. |
+| `DOKKU_SYSTEM_GROUP`           | `dokku`                         | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | System group to chown files as. |
+| `DOKKU_SYSTEM_USER`            | `dokku`                         | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | System user to chown files as. |
+| `DOKKU_WAIT_TO_RETIRE`         | `60`                            | `dokku config:set`                                                                                                                               | After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running http connections. |

docs/configuration/nginx.md

@@ -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)
@@ -42,165 +42,38 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
 
 > Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
 
-### Example Custom Template
-
-Use case: add an `X-Served-By` header to requests
-
-```go
-server {
-  listen      [::]:{{ .NGINX_PORT }};
-  listen      {{ .NGINX_PORT }};
-  server_name {{ .NOSSL_SERVER_NAME }};
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  # set a custom header for requests
-  add_header X-Served-By www-ec2-01;
-
-  gzip on;
-  gzip_min_length  1100;
-  gzip_buffers  4 32k;
-  gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
-  gzip_vary on;
-  gzip_comp_level  6;
-
-  location    / {
-    proxy_pass  http://{{ .APP }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
-}
-
-upstream {{ .APP }} {
-{{ range .DOKKU_APP_LISTENERS | split " " }}
-  server {{ . }};
-{{ end }}
-}
-```
-
-### Example HTTP to HTTPS Custom Template
-Use case: a simple dockerfile app that includes `EXPOSE 80`
-
-```go
-server {
-  listen      [::]:80;
-  listen      80;
-  server_name {{ .NOSSL_SERVER_NAME }};
-
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  return 301 https://$host:443$request_uri;
-}
-server {
-  listen      [::]:443 ssl spdy;
-  listen      443 ssl spdy;
-  {{ if .NOSSL_SERVER_NAME }}server_name {{ .NOSSL_SERVER_NAME }}; {{ end }}
-  {{ if .SSL_SERVER_NAME }}server_name {{ .SSL_SERVER_NAME }}; {{ end }}
-
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  ssl_certificate     {{ .APP_SSL_PATH }}/server.crt;
-  ssl_certificate_key {{ .APP_SSL_PATH }}/server.key;
-
-  keepalive_timeout   70;
-  add_header          Alternate-Protocol  443:npn-spdy/2;
-  location    / {
-    proxy_pass  http://{{ .APP }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
-}
-
-upstream {{ .APP }} {
-{{ range .DOKKU_APP_LISTENERS | split " " }}
-  server {{ . }};
-{{ end }}
-}
-```
-
-### Example using new proxy port mapping
-
-```go
-{{ range $port_map := .PROXY_PORT_MAP | split " " }}
-{{ $port_map_list := $port_map | split ":" }}
-{{ $scheme := index $port_map_list 0 }}
-{{ $listen_port := index $port_map_list 1 }}
-{{ $upstream_port := index $port_map_list 2 }}
-
-server {
-  listen      [::]:{{ $listen_port }};
-  listen      {{ $listen_port }};
-  server_name {{ $.NOSSL_SERVER_NAME }};
-  access_log  /var/log/nginx/{{ $.APP }}-access.log;
-  error_log   /var/log/nginx/{{ $.APP }}-error.log;
-
-  location    / {
-
-    gzip on;
-    gzip_min_length  1100;
-    gzip_buffers  4 32k;
-    gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
-    gzip_vary on;
-    gzip_comp_level  6;
-
-    proxy_pass  http://{{ $.APP }}-{{ $upstream_port }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
-}
-
-{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
-upstream {{ $.APP }}-{{ $upstream_port }} {
-{{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }}
-{{ $listener_list := $listeners | split ":" }}
-{{ $listener_ip := index $listener_list 0 }}
-{{ $listener_port := index $listener_list 1 }}
-  server {{ $listener_ip }}:{{ $listener_port }};{{ end }}
-}
-{{ end }}
-```
-
 ### Customizing via configuration files included by the default templates
 
 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`
+
+    web: vendor/bin/heroku-php-nginx -C nginx.conf -i php.ini php/
+    
+Your `nginx.conf` file - not to be confused with Dokku's `nginx.conf.sigil` - would also need to be configured as shown in this example:
+
+    client_max_body_size 50m;
+    location / {
+        index index.php;
+        try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+Please adjust the `Procfile` and `nginx.conf` file as appropriate.
 
 ## Domains plugin
 

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.
 ```
 
@@ -117,6 +117,10 @@ The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security)
 
 Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.
 
+## HTTP/2 support
+
+Certain versions of nginx have bugs that prevent [HTTP/2](https://nginx.org/en/docs/http/ngx_http_v2_module.html) from properly responding to all clients, thus causing applications to be unavailable. For HTTP/2 to be enabled in your applications' nginx configs, you need to have installed nginx 1.11.5 or higher. See [issue 2435](https://github.com/dokku/dokku/issues/2435) for more details.
+
 ## Running behind a load balancer
 
 Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-Port` and `X-Forwarded-For`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers.
@@ -125,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;
@@ -162,4 +166,4 @@ This could result in security issue, for example, if your application looks at t
 
 ### SSL Port Exposure
 
-When your app is served from port `80` then the `/home/dokku/APP/nginx.conf` file will automatically be updated to instruct nginx to respond to ssl on port 443 as a new cert is added.  If your app uses a non-standard port (perhaps you have a dockerfile deploy exposing port `99999`) you may need to manually expose an ssl port via `dokku proxy:ports-add <APP> https:443:99999`.  
+When your app is served from port `80` then the `/home/dokku/APP/nginx.conf` file will automatically be updated to instruct nginx to respond to ssl on port 443 as a new cert is added.  If your app uses a non-standard port (perhaps you have a dockerfile deploy exposing port `99999`) you may need to manually expose an ssl port via `dokku proxy:ports-add <APP> https:443:99999`.

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
 ```
@@ -59,6 +59,10 @@ git remote add dokku dokku@dokku.me:ruby-rails-sample
 git push dokku master
 ```
 
+> Note: Some tools may not support the short-upstream syntax referenced above, and you may need to prefix
+> the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-rails-sample`
+> Please see the [Git](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) documentation for more details.
+
 ```
 Counting objects: 231, done.
 Delta compression using up to 8 threads.
@@ -89,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
 ```
 
@@ -121,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
 ```
 
@@ -132,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
@@ -198,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,39 @@ 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
 ```
 
+### 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 +204,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 +225,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/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,17 +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
 
-> Changed as of 0.5.0
+If an application was previously deployed via Buildpacks, the following commands should be run before a Dockerfile deploy will succeed:
 
-Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port per line) and setup nginx to proxy the same port numbers to listen publicly. If you would like to change the exposed port, you should do so within your `Dockerfile` and app.
-
-> Note: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`
-
-If you do not explicitly `EXPOSE` a port in your `Dockerfile`, Dokku will configure the nginx proxy to listen on port 80 (and 443 for TLS) and forward traffic to your app listening on port 5000 inside the container. Just like buildpack apps, you can also use the `$PORT` environment variable in your app to maintain portability.
-
-When ports are exposed through the default nginx proxy, they are proxied externally as HTTP ports. At this time, in no case do we proxy plain TCP or UDP ports. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
+```shell
+dokku config:unset --no-restart node-js-app DOKKU_PROXY_PORT_MAP 
+```
 
 ## Build-time Configuration Variables
 
@@ -63,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`:
@@ -113,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/methods/images.md

@@ -20,6 +20,10 @@ The Dokku tags plugin allows you to add docker image tags to the currently deplo
 
 ## Usage
 
+### Exposed ports
+
+See the [port management documentation](/docs/networking/port-management.md).
+
 ### Listing tags for an application
 
 For example, you can list all tags for a given application:
@@ -124,9 +128,6 @@ You can alternatively add image pulled from a docker Registry and deploy app fro
     dokku tags:deploy test-app v12
     ```
 
-> Note: When deploying an image, we will use `docker inspect` to extract the `ExposedPorts` configuration and if defined, use that to populate `DOKKU_DOCKERFILE_PORTS`. If this behavior is not desired, you can override that configuration variable with the `config:set` command.
-> Example: `dokku config:set test-app DOKKU_DOCKERFILE_PORTS="5984/tcp 80/tcp"`
-
 ### Deploying an image from CI
 
 To ensure your builds are always reproducible, it's considered bad practice to store build

docs/deployment/one-off-processes.md

@@ -5,7 +5,7 @@ Sometimes you need to either inspect running containers or run a one-off command
 ## Run a command in an app environment
 
 ```
-run <app> <cmd>                                # Run a command in the environment of an application
+run <app> <cmd>                                # Run a command in a new container using the current application image
 ```
 
 The `run` command can be used to run a one-off process for a specific command. This will start a new container and run the desired command within that container. Note that this container will be stay around even after command completes. The container will be the same container as was used to start the currently deployed application.
@@ -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

@@ -14,6 +14,7 @@ ps:scale <app> <proc>=<count> [<proc>=<count>] # Get/Set how many instances of a
 ps:set-restart-policy <app> <policy>           # Sets app restart-policy
 ps:start <app>                                 # Start app container(s)
 ps:stop <app>                                  # Stop app container(s)
+ps:stopall                                     # Stop all app container(s)
 ```
 
 By default, Dokku will only start a single `web` process - if defined - though process scaling can be managed by the `ps` plugin or [via a custom `DOKKU_SCALE` file](/docs/deployment/process-management.md#manually-managing-process-scaling).
@@ -93,12 +94,18 @@ dokku ps:scale node-js-app
 
 ### Stopping applications
 
-Deployed applications can be stopped using the `ps:stop` command. This turns all running containers for an application, and will result in a `502 Bad Gateway` response for the default nginx proxy implementation.
+Deployed applications can be stopped using the `ps:stop` command. This turns off all running containers for an application, and will result in a `502 Bad Gateway` response for the default nginx proxy implementation.
 
 ```shell
 dokku ps:stop node-js-app
 ```
 
+You may also stop all applications at once:
+
+```shell
+dokku ps:stopall
+```
+
 ### Starting applications
 
 All stopped containers can be started using the `ps:start` command. This is similar to running `ps:restart`, except no action will be taken if the application containers are running.
@@ -115,7 +122,7 @@ By default, Dokku will automatically restart containers that exit with a non-zer
 
 ### Showing the current restart policy
 
-THe `ps:restart-policy` command will show the currently configured restart policy for an application. The default policy is `on-failure:10`
+The `ps:restart-policy` command will show the currently configured restart policy for an application. The default policy is `on-failure:10`
 
 ```shell
 dokku ps:restart-policy node-js-app

docs/deployment/user-management.md

@@ -46,7 +46,7 @@ dokku ssh-keys:add KEY_NAME path/to/id_rsa.pub
 b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
 ```
 
-`KEY_NAME` is the username prefer to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.
+`KEY_NAME` is the name you want to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.
 
 > `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
 

docs/deployment/zero-downtime-deploys.md

@@ -15,6 +15,14 @@ By default, Dokku will wait `10` seconds after starting each container before as
 
 You may both create user-defined checks for web processes using a `CHECKS` file, as well as customize any and all parts of this experience using the checks plugin.
 
+> Web checks are performed via `curl` on Dokku host. Some application code - such
+> as the Django framework - checks for specific hostnames or header values, these
+> checks will fail. To avoid this:
+>
+> - Remove such checks from your code: Modify your application to remove the hostname check completely
+> - Allow checks from all hostnames: Modify your application to accept a dynamically provided hostname
+> - Specify the domain within the check: See below for further documentation
+
 ## Configuring Check Settings using the `config` plugin
 
 There are certain settings that can be configured via environment variables:
@@ -137,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.
@@ -278,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
@@ -288,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:
@@ -307,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
@@ -315,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
@@ -352,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
@@ -362,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:
@@ -402,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
@@ -423,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,38 +29,6 @@ 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`
-
-- 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
-```
-
-### `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
-```
-
 ### `check-deploy`
 
 - Description: Allows you to run checks on a deploy before Dokku allows the container to handle requests.
@@ -87,7 +55,7 @@ if [[ "$DOKKU_DISABLE_DEPLOY" = "true" ]]; then
 fi
 ```
 
-### `comands help` and `commands <PLUGIN_NAME>:help`
+### `commands help` and `commands <PLUGIN_NAME>:help`
 
 - Description: Your plugin should implement a `help` command in your `commands` file to take advantage of this plugin trigger. `commands help` is used by `dokku help` to aggregate all plugins abbreviated `help` output. Implementing  `<PLUGIN_NAME>:help` in your `commands` file gives users looking for help, a more detailed output. 'commands help' must be implemented inside the `commands` plugin file. It's recommended that `PLUGIN_NAME:help` be added to the commands file to ensure consistency among community plugins and give you a new avenue to share rich help content with your user.
 - Invoked by: `dokku help` and `commands <PLUGIN_NAME>:help`
@@ -138,7 +106,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 +122,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 +147,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 +191,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,26 +235,21 @@ 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`
 
 - Description:
 - Invoked by: `dokku deploy`
-- Arguments: `$APP $IMAGE_TAG`
+- Arguments: `$APP $IMAGE_TAG [$PROC_TYPE $CONTAINER_INDEX]`
 - Example:
 
 ```shell
@@ -321,7 +311,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.
 
@@ -344,16 +334,151 @@ if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
 fi
 ```
 
+### `network-build-config`
+
+- Description: Rebuilds network configuration
+- Invoked by: `internally triggered by proxy-build-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
+- Invoked by: `internally triggered by proxy-build-config within proxy implementations`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-config-exists`
+
+- Description: Returns whether the network configuration for a given app exists
+- Invoked by: `internally triggered by core-post-deploy within proxy implementations`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-get-ipaddr`
+
+- Description: Return the ipaddr for a given app container
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP $PROC_TYPE $CONTAINER_ID`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-get-listeners`
+
+- Description: Return the listeners (host:port combinations) for a given app container
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-get-port`
+
+- Description: Return the port for a given app container
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP $PROC_TYPE $CONTAINER_ID $IS_HEROKUISH_CONTAINER`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-get-property`
+
+- Description: Return the network value for an app's property
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP $KEY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-write-ipaddr`
+
+- Description: Write the ipaddr for a given app index
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP $PROC_TYPE $CONTAINER_INDEX $IP_ADDRESS`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `network-write-port`
+
+- Description: Write the port for a given app index
+- Invoked by: `internally triggered by a deploy`
+- Arguments: `$APP $PROC_TYPE $CONTAINER_INDEX $PORT`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `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
 
@@ -380,9 +505,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:
@@ -397,7 +552,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:
@@ -410,9 +565,58 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `post-certs-remove`
+
+- Description: Allows you to run commands after a cert is removed
+- Invoked by: `dokku certs:remove`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; verify_app_name "$APP"
+
+# TODO
+```
+
+### `post-certs-update`
+
+- Description: Allows you to run commands after a cert is added/updated
+- Invoked by: `dokku certs:add`, `dokku certs:update`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+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:
@@ -433,7 +637,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:
@@ -454,7 +658,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:
@@ -470,7 +674,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:
@@ -487,7 +691,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:
@@ -509,7 +713,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:
@@ -529,7 +733,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:
@@ -556,7 +760,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:
@@ -574,14 +778,14 @@ verify_app_name "$APP"
 
 ### `post-stop`
 
-- Description: Can be used to run commands after an application is manually stopped
-- Invoked by: `dokku ps:stop`
+- 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
 
@@ -592,7 +796,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:
@@ -607,7 +811,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:
@@ -629,7 +833,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"
@@ -644,7 +848,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:
@@ -665,70 +869,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
@@ -763,11 +903,57 @@ APP="$1"; verify_app_name "$APP"
 # TODO
 ```
 
-### `post-certs-update`
+### `pre-receive-app`
 
-- Description: Allows you to run commands after a cert is added/updated
-- Invoked by: `dokku certs:add`, `dokku certs:update`
-- Arguments: `$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
@@ -775,15 +961,80 @@ APP="$1"; verify_app_name "$APP"
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; verify_app_name "$APP"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 # TODO
 ```
 
-### `post-certs-remove`
+### `pre-restore`
 
-- Description: Allows you to run commands after a cert is removed
-- Invoked by: `dokku certs:remove`
+- 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 app is started
+- Invoked by: `dokku ps:start`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Notifies an example url that an app is starting
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1";
+
+curl "https://dokku.me/starting/${APP}" || true
+```
+
+### `proxy-build-config`
+
+- Description: Builds the proxy implementation configuration for a given app
+- Invoked by: `internally triggered by ps:restore`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `proxy-enable`
+
+- Description: Enables the configured proxy implementation for an app
+- Invoked by: `internally triggered by ps:restore`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `proxy-disable`
+
+- Description: Disables the configured proxy implementation for an app
+- Invoked by: `internally triggered by ps:restore`
 - Arguments: `$APP`
 - Example:
 
@@ -791,15 +1042,13 @@ APP="$1"; verify_app_name "$APP"
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; verify_app_name "$APP"
 
 # TODO
 ```
 
 ### `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:
@@ -833,7 +1082,7 @@ newrev=$2
 APP=${refname/*\//}.$reference_app
 
 if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
-  REFERENCE_REPO="$DOKKU_ROOT/$reference_app
+  REFERENCE_REPO="$DOKKU_ROOT/$reference_app"
   git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" > /dev/null
 fi
 plugn trigger receive-app $APP $newrev
@@ -853,19 +1102,131 @@ 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`
+
+- 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`
+
+- 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-run`
+
+- 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`
+
+- 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`
+
+- 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`
+
+- 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)
@@ -877,7 +1238,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:
@@ -889,7 +1250,7 @@ docker push $DOCKER_HUB_USER/$APP:$IMAGE_TAG
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 APP="$1"; IMAGE_TAG="$2"
 
-some code to remove a docker hub tag because it's not implemented in the CLI....
+# some code to remove a docker hub tag because it's not implemented in the CLI...
 ```
 
 ### `uninstall`
@@ -899,16 +1260,16 @@ some code to remove a docker hub tag because it's not implemented in the CLI....
  - Arguments: `$PLUGIN`
  - Example:
 
- ```shell
- #!/usr/bin/env bash
- # Cleanup up extra containers created
+```shell
+#!/usr/bin/env bash
+# Cleanup up extra containers created
 
- set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
- PLUGIN="$1"
+PLUGIN="$1"
 
- [[ "$PLUGIN" = "my-plugin" ]] && docker rmi -f "${PLUGIN_IMAGE_DEPENDENCY}"
- ```
+[[ "$PLUGIN" = "my-plugin" ]] && docker rmi -f "${PLUGIN_IMAGE_DEPENDENCY}"
+```
 
  > To avoid uninstalling other plugins make sure to check the plugin name like shown in the example.
 
@@ -949,7 +1310,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.10.3-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.12.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
@@ -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/advanced-installation.md

@@ -44,17 +44,21 @@ cd dokku
 sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install
 ```
 
-## Configuring
+## Skipping herokuish installation
+
+The `herokuish` package is recommended but not required if not using Heroku Buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
+
+## Configuring an unattended installation
 
 Once Dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
 
+For Debian, unattended installation is described [Debian installation guide](/docs/getting-started/install/debian.md).
+
 *You should also stop and disable the `dokku-installer` service to remove public access to adding SSH keys.*
 
-Set up a domain and a wildcard domain pointing to that host. Make sure `/home/dokku/VHOST` is set to this domain. By default it's set to whatever hostname the host has. This file is only created if the hostname can be resolved by dig (`dig +short $(hostname -f)`). Otherwise you have to create the file manually and set it to your preferred domain. If this file still is not present when you push your app, Dokku will publish the app with a port number (i.e. `http://example.com:49154` - note the missing subdomain).
+Set up a domain using your preferred vendor and a wildcard domain pointing to the host running dokku. You can manage this global domain using the [domains plugin](/docs/configuration/domains.md).
 
-Follow the [user management documentation](/docs/deployment/user-management.md) in order to add users to Dokku, or to give other Unix accounts access to Dokku.
-
-That's it!
+Follow the [user management documentation](/docs/deployment/user-management.md) in order to add ssh keys for users to Dokku, or to give other Unix accounts access to Dokku.
 
 ## VMs with less than 1GB of memory
 

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
@@ -35,7 +37,7 @@ After setting the desired options, proceed with the installation as described ab
 | Name               | Type    | Default               | Description                                                              |
 | ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ |
 | dokku/web_config   | boolean | true                  | Use web-based config for below options                                   |
-| dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g. <app>.dokku.me)                        |
+| dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g., <app>.dokku.me)                        |
 | dokku/hostname     | string  | dokku.me              | Hostname, used as vhost domain and for showing app URL after deploy      |
-| dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: This setting this to true, will require you to manually add an SSH key later on. |
+| dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: Setting this to true, will require you to manually add an SSH key later on. |
 | dokku/key_file     | string  | /root/.ssh/id_rsa.pub | Path on disk to an SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |

docs/getting-started/install/digitalocean.md

@@ -19,4 +19,4 @@
 7. Under **Finalize and create**, give your droplet a hostname _(not required)_ and click **Create**.
 8. Once created, copy the IP address to your clipboard.
 9. In a browser, go to the IP address you copied above and fill out the presented form to complete configuration. **Failure to do so may allow others to reconfigure SSH access on your server.**
-10. Once the web ui has been submitted, you will be redirected to our [application deployment tutorial](http://dokku.viewdocs.io/dokku/deployment/application-deployment/), which will guide you through deploying a sample application to your Dokku server.
+10. Once the web ui has been submitted, you will be redirected to our [application deployment tutorial](/docs/deployment/application-deployment.md), which will guide you through deploying a sample application to your Dokku server.

docs/getting-started/install/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,22 +21,27 @@ 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.10.3/bootstrap.sh;
-sudo DOKKU_TAG=v0.10.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
 
+If you're using Debian 8 or Ubuntu 14.04, make sure your package manager is configured to install a sufficiently recent version of nginx<sup>[3]</sup>, otherwise, the installation may fail due to "unmet dependencies" relating nginx.
+
 #### 2. Setup SSH key and Virtualhost Settings
 
 Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure Dokku via the web admin.
 
->**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.
+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:** 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.
+> **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
 
@@ -57,3 +62,4 @@ As well, you may wish to customize your installation in some other fashion. or e
 
 - <sup>[1]: To check whether your system has an fqdn set, run `sudo hostname -f`</sup>
 - <sup>[2]: If your system has less than 1GB of memory, you can use [this workaround](/docs/getting-started/advanced-installation.md#vms-with-less-than-1gb-of-memory).</sup>
+- <sup>[3]: nginx >= 1.8.0 can be installed via the [nginx repositories](https://www.nginx.com/resources/admin-guide/installing-nginx-open-source/), or by adding [this PPA](https://launchpad.net/~nginx/+archive/ubuntu/stable) if you're using Ubuntu. nginx >= 1.11.5 is necessary for HTTP/2 support</sup>

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/uninstalling.md

@@ -36,7 +36,7 @@ All applications should be stopped, and all docker containers and images deleted
 
 ```shell
 # stop all applications
-dokku --quiet apps | xargs dokku ps:stop
+dokku ps:stopall
 
 # cleanup containers and images
 dokku cleanup

docs/getting-started/upgrading.md

@@ -2,6 +2,27 @@
 
 If your version of Dokku is pre 0.3.0 (check with `dokku version`), we recommend [a fresh install](/docs/getting-started/installation.md) on a new server.
 
+## Security Updates
+
+For any security related updates, please follow our [twitter account](https://twitter.com/dokku). As Dokku does not run any daemons, the security risk introduced by our software is minimal.
+
+Your operating system may occasionally provide security updates. We recommend setting unattended upgrades for your operating system. Here are some helpful links:
+
+- [Arch Linux System Maintenance](https://wiki.archlinux.org/index.php/System_maintenance)
+- [Centos Automatic Security Updates](https://serversforhackers.com/c/automatic-security-updates-centos)
+- [Debian Unattended Upgrades](https://wiki.debian.org/UnattendedUpgrades)
+- [Ubuntu Unattended Upgrades](https://help.ubuntu.com/community/AutomaticSecurityUpdates)
+
+Docker releases updates periodically to their engine. We recommend reading their release notes and upgrading accordingly. Please see the [Docker documentation](https://docs.docker.com/) for more details.
+
+Finally, we provide a helpful binary called `dokku-update`. This is a recommended package that:
+
+- Can be installed separately, so upgrading Dokku will not affect the running of this package.
+- Automates many of the upgrade instructions for you.
+- Provides a clean way for us to further enhance the upgrade process in the future.
+
+When installing from source, this is available from `contrib/dokku-update`, and is also available on Debian and RPM-based systems from our package repositories under the name `dokku-update`.
+
 ## Migration Guides
 
 Before upgrading, check the migration guides to get comfortable with new features and prepare your deployment to be upgraded.
@@ -18,14 +39,38 @@ Before upgrading, check the migration guides to get comfortable with new feature
 
 - [0.7 Migration Guide](/docs/appendices/0.7.0-migration-guide.md)
 
+### 0.8 Migration Guide
+
+- [0.8 Migration Guide](/docs/appendices/0.8.0-migration-guide.md)
+
+### 0.9 Migration Guide
+
+- [0.9 Migration Guide](/docs/appendices/0.9.0-migration-guide.md)
+
+### 0.10 Migration Guide
+
+- [0.10 Migration Guide](/docs/appendices/0.10.0-migration-guide.md)
+
 ## Upgrade Instructions
 
 If Dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:
 
 ```shell
+# update your local apt cache
 sudo apt-get update
-dokku --quiet apps | xargs -L1 dokku ps:stop # stops each running app
+
+# stop each running app
+# for 0.11.4 and newer versions, use
+dokku ps:stopall
+# for versions between 0.8.1 and 0.11.3, use
+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 its dependencies
 sudo apt-get install -qq -y dokku herokuish sshcommand plugn
+
+# rebuild all of your applications
 dokku ps:rebuildall # rebuilds all 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.10.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/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.10.3/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.10.3 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
@@ -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 "trusty utopic vivid wily xenial yakkety zesty artful bionic" | 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>
 
@@ -246,22 +256,6 @@
           Jose Diaz-Gonzalez
           <a class="fund-link" href="http://www.amazon.com/registry/wishlist/36RYHSXCFYDTG/">Buy him something nice</a>
         </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/u2mejc-hidden.jpg" alt="Justin Clark">
-            <img src="./assets/team/u2mejc.jpg" alt="Justin Clark">
-          </div>
-          Justin Clark
-          <a class="fund-link" href="http://smile.amazon.com/registry/wishlist/3SCPXMNI2EIYV">Feed his dog greenie treats!</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/flink-hidden.jpg" alt="Loïc Guitaut">
-            <img src="./assets/team/flink.jpg" alt="Loïc Guitaut">
-          </div>
-          Loïc Guitaut
-          <a class="fund-link" href="https://www.amazon.com/gp/registry/wishlist/23NWY5AVAGGGO/">Build out his star wars collection</a>
-        </div>
         <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
           <div class="team-member-image">
             <img src="./assets/team/michaelshobbs-hidden.jpg" alt="Michael Hobbs">
@@ -270,14 +264,6 @@
           Michael Hobbs
           <a class="fund-link" href="https://gratipay.com/~michaelshobbs/">Fund on gratipay</a>
         </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/morrisjobke-hidden.jpg" alt="Morris Jobke">
-            <img src="./assets/team/morrisjobke.jpg" alt="Morris Jobke">
-          </div>
-          Morris Jobke
-          <a class="fund-link" href="">Get him an ebook</a>
-        </div>
       </div>
     </div>
 

docs/networking/dns.md

@@ -24,20 +24,19 @@ Please remember that DNS relies heavily on _caching_.  Changes you make to DNS c
 
 Don't be afraid to ask if you need help.  Create a [new issue](https://github.com/dokku/dokku/issues) and someone will be glad to assist you.
 
-
 ## Getting started
 
 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`.
 
@@ -72,11 +71,11 @@ 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.
 
 Using the 'root' of your domain is nearly identical to the previous example.
 
-* hostname is under `example.tld`, still needs `A` record
-* Need to modify `/home/dokku/HOSTNAME` and `/home/dokku/VHOST`
+* hostname is under `example.tld`, still needs `A` record.
+* Update your global domain using the [domains plugin](docs/configuration/domains.md).

docs/networking/network.md

@@ -0,0 +1,124 @@
+# Network Management
+
+> New as of 0.11.0
+
+```
+network:report [<app>] [<flag>]          # Displays a network report for one or more apps
+network:rebuild <app>                    # Rebuilds network settings for an app
+network:rebuildall                       # Rebuild network settings for all apps
+network:set <app> <key> (<value>)        # Set or clear a network property for an app
+```
+
+The Network plugin allows developers to abstract the concept of container network management, allowing developers to both change what networks a given container is attached to as well as rebuild the configuration on the fly.
+
+## Usage
+
+### Rebuilding network settings
+
+There are cases where you may need to rebuild the network configuration for an app, such as on app boot or container restart. In these cases, you can use the `network:rebuild` command:
+
+```shell
+dokku network:rebuild node-js-app
+```
+
+> This command will exit a non-zero number that depends on the number of containers for which configuration could not be built
+
+### Rebuilding all network settings
+
+In some cases, a docker upgrade may reset container IPs or Ports. In both cases, you can quickly rewrite those files by using the `network:rebuildall` command:
+
+```shell
+dokku network:rebuildall
+```
+
+> This command will exit a non-zero number that depends on the number of containers for which configuration could not be built
+
+### Container network interface binding
+
+> This functionality does not control the `--network` docker flag. Please use the [docker-options plugin](docs/advanced-usage/docker-options.md) to manage this flag.
+
+By default, an application will only bind to the internal interface. This behavior can be modified per app by changing the `bind-all-interfaces` network property.
+
+```shell
+# bind to the default docker interface (`docker0`) with a random internal ip
+# this is the default behavior
+dokku network:set node-js-app bind-all-interfaces false
+
+# bind to all interfaces (`0.0.0.0`) on a random port for each upstream port
+# this will make the app container directly accessible by other hosts on your network
+# ports are randomized for every deploy, e.g. `0.0.0.0:32771->5000/tcp`.
+dokku network:set node-js-app bind-all-interfaces true
+```
+
+By way of example, in the default case, each container is bound to the docker interface:
+
+```shell
+docker ps
+```
+
+```
+CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS               NAMES
+1b88d8aec3d1        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute                       node-js-app.web.1
+```
+
+As such, the container's IP address will be an internal IP, and thus it is only accessible on the host itself:
+
+```
+docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' node-js-app.web.1
+```
+
+```
+172.17.0.6
+```
+
+However, you can disable the internal proxying via the `network:set` command so that it will listen on the host's IP address:
+
+```shell
+dokku network:set node-js-app bind-all-interfaces true
+
+# container bound to all interfaces
+docker ps
+```
+
+```
+CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS                     NAMES
+d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   node-js-app.web.1
+```
+
+### Displaying network reports about an app
+
+You can get a report about the app's network status using the `network:report` command:
+
+```shell
+dokku network:report
+```
+
+```
+=====> node-js-app network information
+       Network bind all interfaces: false
+       Network listeners: 172.17.0.1:5000
+=====> python-sample network information
+       Network bind all interfaces: false
+       Network listeners: 172.17.0.2:5000
+=====> ruby-sample network information
+       Network bind all interfaces: true
+       Network listeners:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku network:report node-js-app
+```
+
+```
+=====> node-js-app network information
+       Network bind all interfaces: false
+       Network listeners: 172.17.0.1:5000
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku network:report node-js-app --network-bind-all-interfaces
+```

docs/networking/port-management.md

@@ -0,0 +1,178 @@
+# Port Management
+
+> New as of 0.5.0, Enhanced in 0.6.0
+
+```
+proxy:ports <app>                        # List proxy port mappings for app
+proxy:ports-set <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for app
+proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Add proxy port mappings for app
+proxy:ports-clear <app>                  # Clear all proxy port mappings for app
+proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Unset proxy port mappings for app
+```
+
+In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
+
+## Usage
+
+### Proxy port mapping
+
+> New as of 0.6.0
+
+You can now configure `host -> container` port mappings with the `proxy:ports-*` commands. This mapping is currently supported by the built-in nginx-vhosts plugin.
+
+To inspect the port mapping for a given application, use the `proxy:ports` command:
+
+```shell
+dokku proxy:ports node-js-app
+```
+
+```
+-----> Port mappings for node-js-app
+-----> scheme             host port                 container port
+http                      80                        5000
+```
+
+The above application is listening on the host's port `80`, which we can test via curl:
+
+```shell
+curl http://node-js-app.dokku.me
+```
+
+```
+Hello World!
+```
+
+There are cases where we may wish for the service to be listening on more than one port, such as port 8080. Normally, this would not be possible:
+
+```shell
+curl http://node-js-app.dokku.me:8080
+```
+
+```
+curl: (7) Failed to connect to node-js-app.dokku.me port 8080: Connection refused
+```
+
+However, we can use the `proxy:ports-add` command to add a second external port mapping - `8080` - to our application's port `5000`.
+
+```shell
+dokku proxy:ports-add 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
+```
+
+We can now test that port 80 still responds properly:
+
+```shell
+curl http://node-js-app.dokku.me
+```
+
+```
+Hello World!
+```
+
+And our new listening port of `8080` also works:
+
+```shell
+curl http://node-js-app.dokku.me:8080
+```
+
+```
+Hello World!
+```
+
+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
+```
+
+By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
+
+> Note: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.
+
+## 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.
+
+### Buildpacks
+
+For buildpack deployments, your application *must* respect the `PORT` environment variable. We will typically set this to port `5000`, but this is not guaranteed. If you do not respect the `PORT` environment variable, your containers may start but your services will not be accessible outside of that container.
+
+### Dockerfile
+
+> Changed as of 0.5.0
+
+Dokku's default proxy implementation - nginx - only supports HTTP request proxying. At this time, we do not support proxying plain TCP or UDP ports. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
+
+#### Applications using EXPOSE
+
+Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port per line) and setup nginx to proxy the same port numbers to listen publicly. If you would like to change the exposed port, you should do so within your `Dockerfile`.
+
+For example, if the Dokku installation is configured with the domain `dokku.me` and an application named `node-js-app` is deployed with following Dockerfile:
+
+```
+FROM ubuntu:14.04
+EXPOSE 1234
+RUN python -m SimpleHTTPServer 1234
+```
+
+The application would be exposed to the user at `node-js-app.dokku.me:1234`. If this is not desired, the following application configuration may be applied:
+
+```shell
+# add a port mapping to port 80
+dokku proxy:ports-add node-js-app http:80:1234
+
+# remove the incorrect port mapping
+dokku proxy:ports-remove node-js-app http:1234:1234
+```
+
+#### Applications not using EXPOSE
+
+Any application that does not use an `EXPOSE` directive will result in Dokku defaulting to port `5000`. This behavior mimics the behavior of a Buildpack deploy. If your application _does not_ support the `PORT` environment variable, then you will either need to:
+
+- modify your application to support the `PORT` environment variable.
+- switch to using an `EXPOSE` directive in your Dockerfile.
+
+#### Switching between `EXPOSE` usage modes
+
+When switching between `EXPOSE` usage modes, it is important to reset your port management. The following two commands can be used to reset your state and redeploy your application.
+
+```shell
+# assuming your application is called `node-js-app`
+dokku config:unset --no-restart node-js-app DOKKU_DOCKERFILE_PORTS PORT
+dokku proxy:ports-clear node-js-app
+```
+
+### Docker Image
+
+When deploying an image, we will use `docker inspect` to extract the `ExposedPorts` configuration and if defined, use that to populate port mapping. If this behavior is not desired, you can override that configuration variable with the following commands.
+
+```shell
+# assuming your application is called `node-js-app`
+dokku config:set node-js-app DOKKU_DOCKERFILE_PORTS="1234/tcp 80/tcp"
+dokku proxy:ports-clear node-js-app
+```
+
+All other port-related behavior is the same as when deploying via Dockerfile.

docs/networking/proxy-management.md

@@ -0,0 +1,86 @@
+# Proxy Management
+
+> New as of 0.5.0, Enhanced in 0.6.0
+
+```
+proxy:disable <app>                      # Disable proxy for app
+proxy:enable <app>                       # Enable proxy for app
+proxy:report [<app>] [<flag>]            # Displays a proxy report for one or more apps
+proxy:set <app> <proxy-type>             # Set proxy type for app
+```
+
+In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
+
+## Usage
+
+### Container network interface binding
+
+> Changed as of 0.11.0
+
+From Dokku versions `0.5.0` until `0.11.0`, enabling or disabling an application's proxy would **also** control whether or not the application was bound to all interfaces - e.g. `0.0.0.0`. As of `0.11.0`, this is now controlled by the network plugin. Please see the [network documentation](/docs/networking/network.md#container-network-interface-binding) for more information.
+
+### Displaying proxy reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the app's proxy status using the `proxy:report` command:
+
+```shell
+dokku proxy:report
+```
+
+```
+=====> node-js-app proxy information
+       Proxy enabled:       true
+       Proxy type:          nginx
+       Proxy port map:      http:80:5000 https:443:5000
+=====> python-sample proxy information
+       Proxy enabled:       true
+       Proxy type:          nginx
+       Proxy port map:      http:80:5000
+=====> ruby-sample proxy information
+       Proxy enabled:       true
+       Proxy type:          nginx
+       Proxy port map:      http:80:5000
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku proxy:report node-js-app
+```
+
+```
+=====> node-js-app proxy information
+       Proxy enabled:       true
+       Proxy type:          nginx
+       Proxy port map:      http:80:5000 https:443:5000
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku proxy:report node-js-app --proxy-type
+```
+
+#### Proxy Port Scheme
+
+The proxy port scheme is as follows:
+
+- `SCHEME:HOST_PORT:CONTAINER_PORT`
+
+The scheme metadata can be used by proxy implementations in order to properly handle proxying of requests. For example, the built-in `nginx-vhosts` proxy implementation supports both the `http` and `https` schemes.
+
+Developers of proxy implementations are encouraged to use whatever schemes make the most sense, and ignore configurations which they do not support. For instance, a `udp` proxy implementation can safely ignore `http` and `https` port mappings.
+
+To change the proxy implementation in use for an application, use the `proxy:set` command:
+
+```shell
+# no validation will be performed against
+# the specified proxy implementation
+dokku proxy:set node-js-app nginx
+```
+
+### Proxy port mapping
+
+See the [port management documentation](/docs/networking/port-management.md).

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.10.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.10.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
@@ -131,16 +131,23 @@
             <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>
 
             <a href="/{{NAME}}/configuration/environment-variables/" class="list-group-item">Environment Variables</a>
-            <a href="/{{NAME}}/configuration/dns/" class="list-group-item">DNS Configuration</a>
             <a href="/{{NAME}}/configuration/domains/" class="list-group-item">Domain Configuration</a>
             <a href="/{{NAME}}/configuration/nginx/" class="list-group-item">Nginx Configuration</a>
             <a href="/{{NAME}}/configuration/ssl/" class="list-group-item">SSL Configuration</a>
 
+            <a href="#" class="list-group-item disabled">Network Management</a>
+
+            <a href="/{{NAME}}/networking/dns/" class="list-group-item">DNS Configuration</a>
+            <a href="/{{NAME}}/networking/network/" class="list-group-item">Network Management</a>
+            <a href="/{{NAME}}/networking/port-management/" class="list-group-item">Port Management</a>
+            <a href="/{{NAME}}/networking/proxy-management/" class="list-group-item">Proxy Management</a>
+
             <a href="#" class="list-group-item disabled">Advanced Usage</a>
 
             <a href="/{{NAME}}/advanced-usage/backup-recovery/" class="list-group-item">Backup and Recovery</a>
@@ -149,13 +156,11 @@
             <a href="/{{NAME}}/advanced-usage/event-logs/" class="list-group-item">Event Logs</a>
             <a href="/{{NAME}}/advanced-usage/persistent-storage/" class="list-group-item">Persistent Storage</a>
             <a href="/{{NAME}}/advanced-usage/plugin-management/" class="list-group-item">Plugin Management</a>
-            <a href="/{{NAME}}/advanced-usage/proxy-management/" class="list-group-item">Proxy and Port 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>
 
@@ -163,6 +168,13 @@
             <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/run-on-external-volume/" class="list-group-item">Run on External Volume</a>
           </div>
         </div>
       </div>
@@ -370,7 +382,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');

docs/viewdocs.json

@@ -15,16 +15,19 @@
     "deployment/images": "deployment/methods/images/",
     "configuration-management": "configuration/environment-variables/",
     "deployment/ssl-configuration": "configuration/ssl/",
-    "dns": "configuration/dns/",
     "nginx": "configuration/nginx/",
 
+    "dns": "networking/dns/",
+    "configuration/dns": "networking/dns/",
+    "proxy": "networking/proxy-management/",
+    "advanced-usage/proxy-management": "networking/proxy-management/",
+
     "backup-recovery": "advanced-usage/backup-recovery/",
     "deployment-tasks": "advanced-usage/deployment-tasks/",
     "deployment/deployment-tasks": "advanced-usage/deployment-tasks/",
     "docker-options": "advanced-usage/docker-options/",
     "dokku-events-logs": "advanced-usage/event-logs/",
     "dokku-storage": "advanced-usage/persistent-storage/",
-    "proxy": "advanced-usage/proxy-management/",
 
     "plugins": "community/plugins/"
   }

dokku

@@ -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_DISTRO
@@ -125,7 +146,7 @@ execute_dokku_cmd() {
   elif [[ -x $PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD ]]; then
     "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD" "$@"
     implemented=1
-  elif [[ -x $PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:} ]]; then
+  elif [[ -x $PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:} ]] && [[ -n "${1#*:}" ]]; then
     "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:}" "$@"
     implemented=1
   fi

plugins/00_dokku-standard/commands

@@ -9,7 +9,7 @@ case "$1" in
       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 the environment of an application
+    run <app> <cmd>, Run a command in a new container using the current application image
     trace [on/off], Enable dokku tracing
     url <app>, Show the first URL for an application (compatibility)
     urls <app>, Show all URLs for an application

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

@@ -23,8 +23,10 @@ get_phase_script() {
 
 execute_script() {
   declare desc="executes appropriate phase script key from app.json"
-  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
-  local PHASE_SCRIPT_KEY="$3"
+  local APP="$1"; local IMAGE_TAG="$2"; local PHASE_SCRIPT_KEY="$3"
+  local IMAGE id
+
+  IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
   local SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null)
   if [[ -n "$SCRIPT_CMD" ]];then
     dokku_log_info1 "Running '$SCRIPT_CMD' in app container"
@@ -55,8 +57,16 @@ execute_script() {
     # strip --restart args from DOCKER_ARGS
     local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
 
-    # shellcheck disable=SC2086
-    local id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_DIR:/cache" $DOCKER_ARGS "$IMAGE" /bin/bash -c "$COMMAND")
+    # eval args as array to respect escapes
+    declare -a ARG_ARRAY
+    eval "ARG_ARRAY=($DOCKER_ARGS)"
+
+    local DOKKU_APP_SHELL="/bin/bash"
+    DOKKU_APP_SHELL="$(config_get --global DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+    DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+    [[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
+
+    id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_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/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.10.3"
+version = "0.12.2"
 [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,28 +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
-
-  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" | xargs)
-  fi
-
-  if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then
-    # shellcheck disable=SC2086
-    docker run $DOKKU_GLOBAL_RUN_ARGS $DOCKER_ARGS $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,50 +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 "
-
-  local DOKKU_RUN_OPTS=""
-  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 $DOCKER_ARGS $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/install

@@ -13,7 +13,7 @@ flag_rsyslog_needs_restart=n
 # shellcheck disable=SC2174
 mkdir -m 775 -p "$DOKKU_LOGS_DIR"
 case "$DOKKU_DISTRO" in
-  arch|debian|centos)
+  arch|debian|centos|rhel)
     chgrp dokku "$DOKKU_LOGS_DIR"
     ;;
   *)
@@ -24,7 +24,7 @@ esac
 if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
   touch "$DOKKU_EVENTS_LOGFILE"
   case "$DOKKU_DISTRO" in
-    arch|debian|centos)
+    arch|debian|centos|rhel)
       chgrp dokku "$DOKKU_EVENTS_LOGFILE"
       ;;
     *)

plugins/20_events/network-build-config

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

plugins/20_events/network-compute-ports

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

plugins/20_events/network-config-exists

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

plugins/20_events/network-get-ipaddr

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

plugins/20_events/network-get-listeners

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

plugins/20_events/network-get-port

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

plugins/20_events/network-get-property

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

plugins/20_events/network-write-ipaddr

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

plugins/20_events/network-write-port

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

plugins/20_events/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.10.3"
+version = "0.12.2"
 [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-build-config

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