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

@@ -0,0 +1,9 @@
+*Dockerfile
+.dockerignore
+.git
+.vagrant
+contrib
+docs
+tests
+!contrib/dokku-installer.py
+!contrib/dokku-update

.editorconfig

@@ -14,3 +14,8 @@ indent_size = 4
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
+
+[*.go]
+insert_final_newline = true
+indent_style = tab
+indent_size = 4

.gitignore

@@ -1,6 +1,11 @@
-.vagrant
+*.deb
+*.rpm
 .DS_Store
+.ruby-version
+.idea/
+.vagrant
+data/
 stack.tgz
 tmp
-*.deb
-.ruby-version
+coverage.out
+contrib/dokku-update-version

.stickler.yml

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

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to contribute
 
-The Dokku project would love to welcome your contributions. There are 
+The Dokku project would love to welcome your contributions. There are
 several ways to help out:
 
 * Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you
@@ -11,6 +11,7 @@ several ways to help out:
 * Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
 * Come up with new ways to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
 * Blog about different ways you are using dokku
+* [Sponsor](https://opencollective.com/dokku#support) the Dokku project financially
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -43,10 +44,10 @@ A great way to contribute to the project is to send a detailed report when you
 encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!
 
-Sometimes dokku is missing a feature you need. In some cases, those features can
+Sometimes  Dokku  is missing a feature you need. In some cases, those features can
 be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
 and we encourage our users to create and contribute such packages. From time to
-time, we will also pull plugins into the dokku core when the task they solve is
+time, we will also pull plugins into the Dokku core when the task they solve is
 a common one for our users.
 
 Check that [our issue database](https://github.com/dokku/dokku/issues)
@@ -54,7 +55,7 @@ doesn't already include that problem or suggestion before submitting an issue.
 If you find a match, add a quick "+1" or "I have this problem too." Doing this
 helps prioritize the most common problems and requests.
 
-When reporting issues, please include your host OS (Ubuntu 14.04, Fedora 19,
+When reporting issues, please include your host OS (Ubuntu 14.04, CentOS 7,
 etc). Please include:
 
 * The output of `uname -a`.
@@ -73,7 +74,7 @@ Our Issue Report Template is available [here](https://github.com/dokku/dokku/blo
 
 ## Contributing
 
-Before you contribute to the dokku project, there are a few things that you'll
+Before you contribute to the Dokku project, there are a few things that you'll
 need to do
 
 * Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -121,7 +122,7 @@ All changes should be be based on the latest master commit.
 
 ### When will my change be merged?
 
-Be patient! The dokku maintainers will review all pull requests and comment as
+Be patient! The Dokku maintainers will review all pull requests and comment as
 quickly as possible. There may be some back and forth while the details of your
 pull request are discussed.
 

HISTORY.md

@@ -1,5 +1,659 @@
 # 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
+
+- #2832: @josegonzalez fix: use python2.7 binary instead of python2 binary
+
+## 0.10.2
+
+### New Features
+
+- #2827: @josegonzalez feat: allow installation of openresty instead of nginx
+
+## 0.10.1
+
+### Bug Fixes
+
+- #2826: @josegonzalez Fix HISTORY.md generator
+
+## 0.10.0
+
+### Bug Fixes
+
+- #2820: @josegonzalez Require netcat in debian packaging
+- #2774: @fruitl00p Include docker-options in the default `dokku`
+- #2778: @zarqman Fix /etc/logrotate.d/dokku on debian
+- #2747: @ebeigarts Update herokuish base image on updates using --pull
+- #2739: @josegonzalez Use listener_port in nginx.conf.sigil
+- #2735: @josegonzalez Ensure we can call ps:report without specifying an application
+- #2733: @josegonzalez Add support for new docker package names
+- #2730: @weyert Ignore the cache directory when cloning an app
+- #2723: @weyert Call non-deprecated plugin:list method
+
+### New Features
+
+- #2822: @josegonzalez refactor: allow skipping cleanup on a per-application basis
+- #2754: @fzerorubigd Add support for set DOKKU_IMAGE per app
+- #2815: @markstory Add stickler-ci configuration.
+- #2809: @oliw Remove aufs step from Makefile
+- #2785: @josegonzalez Add a release-plugin binary
+- #2777: @stokarenko Turn on ps-post-stop hook.
+- #2781: @fruitl00p Adds docker.io support
+- #2766: @josegonzalez Upgrade to herokuish 0.3.29
+- #2765: @josegonzalez Install python3-software-properties as an alternative to python-software-properties
+- #2642: @chiedo Added better default nginx error pages
+- #2678: @callahad Default to secure PCI-compliant SSL setup
+- #2734: @josegonzalez Allow quieter report output
+
+### Documentation
+
+- #2803: @iSDP Adding related articles on the Docker Image Deployment page
+- #2798: @znz Update CURL_CONNECT_TIMEOUT in docs
+- #2795: @josegonzalez docs: Add documentation around adding build-time configuration variables
+- #2791: @yazinsai Correct typo in persistent storage docs
+- #2789: @h4ckninja Subject-verb agreement
+- #2790: @flyinggrizzly Add entry for insecure connection issue in Rails
+- #2788: @josegonzalez Flesh out uninstallation documentation
+- #2784: @josegonzalez Document special dokku environment variables
+- #2773: @znz Update year in footer [ci skip]
+- #2768: @znz Ubuntu 12.04 is EOL
+- #2769: @lucianopf Fix SlackButton for mobile devices.
+- #2763: @ZiadSalah Update vagrant documentation for windows users
+- #2764: @joshmanders Create PULL_REQUEST_TEMPLATE.md
+- #2758: @AxelTheGerman Update doc location for dokku-git-rev community plugin
+- #2757: @nodanaonlyzuul Fix typo from "To use a dockerfiles" to "To use a dockerfile" singular
+- #2753: @abrkn Use short-hand method for shutting down all applications in upgrade docs
+- #2746: @josegonzalez Add redirect for installation to advanced install docs
+- #2738: @josegonzalez Add missing `NO_SSL_SERVER_NAME` to example template
+- #2457: @john-doherty Update Digitalocean installation instructions
+- #2725: @timaschew Fix typo in application management docs
+- #2719: @joshco Clarify that nginx.conf.sigil must be committed to repository
+- #2715: @josegonzalez Use urls that are linkable on github
+
+## 0.9.4
+
+### Documentation
+
+- #2710: @josegonzalez Quiet output for git-related commands
+
+## 0.9.3
+
+### Bug Fixes
+
+- #2706: @josegonzalez fix: ensure nginx conf.d directory exists when running nginx install hook
+- #2701: @scjody Set SSH_USER for root commands
+
+### New Features
+
+- #2708: @josegonzalez Document that we will not do buildpack support in the issue tracker
+
+### Documentation
+
+- #2709: @michaelshobbs increase CURL_TIMEOUT and CURL_CONNECT_TIMEOUT defaults
+- #2699: @mbreit Add support for git >= 2.11
+
+## 0.9.2
+
+### New Features
+
+- #2698: @josegonzalez docs: Document that we only care about specific sections
+- #2697: @callahad Restore installer note regarding AUFS on Linode
+- #2694: @scjody Add documentation note re: git-pre-pull vs. auth
+
+### Documentation
+
+- #2695: @michaelshobbs add tests for pre/post deploy tasks
+
+## 0.9.1
+
+### Bug Fixes
+
+- #2693: @josegonzalez fix: explicitly chown data and data/storage directories
+
+## 0.9.0
+
+### Bug Fixes
+
+- #2691: @josegonzalez Fix package building when golang binaries are available
+- #2671: @znz Fix variable name
+- #2672: @callahad Fix logrotate on Debian
+- #2666: @josegonzalez Use correct flag for build arguments when installing herokuish
+- #2664: @pvalentim Fix remote name when using --remote option with apps:create
+
+### New Features
+
+- #2689: @mbreit Add dokku-monit to community plugin list
+- #2683: @josegonzalez Ensure we have an example for adding keys as another user
+- #2682: @josegonzalez Clarify supported stanzas in app.json
+- #2679: @callahad Remove unnecessary Linode-specific instructions
+- #2670: @znz Remove duplicated `(i.e. `
+
+### Documentation
+
+- #2685: @josegonzalez Pass shellcheck on os x
+- #2677: @callahad Prefer HTTP2 to SPDY in nginx-vhosts
+- #2673: @michaelshobbs Update to herokuish 0.3.27
+- #2674: @michaelshobbs Update sshcommand to 0.7.0
+- #2654: @ebeigarts Enable nginx and docker on system startup when using bootstrap.sh on CentOS
+- #2546: @michaelshobbs Convert repo plugin to golang
+
+## 0.8.2
+
+### New Features
+
+- #2660: @josegonzalez allow installation of plugins via tarball
+- #2661: @josegonzalez Do not run builds in quiet mode
+
+## 0.8.1
+
+### Bug Fixes
+
+- #2519: @tkalus Further guard against duplicate ssl server names
+- #2554: @josegonzalez Add ssl ports when generating a self-signed certificate
+- #2555: @josegonzalez Skip failing applications when running ps:restore on boot
+- #2576: @znz Remove unused variable
+- #2592: @josegonzalez always set a default ssl port for apps with ssl enabled
+- #2612: @josegonzalez Ensure VHOST files exist before executing commands against them
+- #2647: @josegonzalez Properly escape post-install variables
+- #2650: @josegonzalez Fix help output for nginx and ssh-keys
+- #2656: @josegonzalez ensure we can call the report subcommand without an app while specifying flags
+- d79a79: @josegonzalez bail early when checking ps output for an undeployed app
+
+### New Features
+
+- #2500: @josegonzalez Suppress output unless the `git submodule update` call fails
+- #2504: @mbtamuli Implement apps:report and storage:report
+- #2508: @OmarShehata Add default functions for all commands
+- #2557: @josegonzalez Dokku cli improvements
+- #2573: @ebeigarts Recommend parallel package for faster ps:restore
+- #2578: @josegonzalez Require specific versions for dokku-maintained packages
+- #2583: @josegonzalez Implement apps:clone subcommand
+- #2586: @bevand10 Add http-proxy support for deb-herokuish installs
+- #2587: @josegonzalez Allow specifying the deploy branch via DOKKU_DEPLOY_BRANCH
+- #2594: @michaelshobbs Upgrade to herokuish v0.3.25
+- #2615: @josegonzalez Implement certs:report
+- #2616: @josegonzalez Replace apps:default subcommand with apps:list
+- #2617: @josegonzalez Implement checks:report
+- #2618: @josegonzalez Implement docker-options:report and storage:report
+- #2619: @josegonzalez Call ssh-keys:help from ssh-keys:default
+- #2620: @josegonzalez Implement domains:report and proxy:report
+- #2622: @raphaklaus Allow file names with multiple dots in certs:add command
+- #2634: @michaelshobbs Update herokuish to 0.3.26
+- #2657: @josegonzalez Add post-extract plugin trigger
+
+### Documentation
+
+- #2475: @pranavgoel25 Minor readme and sponsor changes
+- #2556: @josegonzalez Use slightly better font style for docs
+- #2560: @ebeigarts Improve install documentation on CentOS
+- #2564: @ka7 Fix spelling mistakes
+- #2565: @josegonzalez Update persistent storage to reference the sample app as normal
+- #2566: @josegonzalez Move "new as of" note in storage docs to correct section
+- #2569: @OmgImAlexis Reload nginx after adding default vhost file
+- #2570: @OmgImAlexis Update ISSUE_TEMPLATE.md to reference `dokku report` command
+- #2580: @znz Fix font URL
+- #2588: @josegonzalez Clarify when the `~/.ssh/config` settings need to match `vagrant ssh-config output`
+- #2605: @andyjeffries Documented build failures when using SSL_CERT_FILE environment variable
+- #2613: @emveeoh Update Linode installation instructions for new GRUB 2 Linode boot option
+- #2626: @znz Update apps:help example command
+- #2629: @znz Update certs:help output for certs:default subcommand
+- #2633: @drpoggi Reference the x-forwarded headers in correct order
+- #2637: @josegonzalez Add documentation surrounding flags that ps:report accepts
+- #2638: @fwolfst Improve README links
+- #2639: @joshco Add documentation for how to grant other Unix accounts Dokku access
+- #2648: @josegonzalez Note that the remote username is important
+- #2659: @jfw Minor clarifications to application deployment tutorial
+
+## 0.8.0
+
+The big kahuna. Lots of documentation changes, and a few bug fixes to make Dokku development a bit easier.
+
+CentOS 7 users will be happy to see that we now have experimental support for your operating system. Huge thanks to @ebeigarts for working on that feature :)
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2407: @josegonzalez Move core post-deploy triggers to core-post-deploy
+- #2442: @znz Fix `is_tag_force_available` bug when docker major version up
+- #2452: @mbtamuli Solves SSH Key problem when admin user already exists
+- #2454: @onbjerg Return exit 1 in config:get if no ENV file exists
+- #2464: @sseemayer Remove duplicate SSL hostnames
+- #2465: @polettix Fix issue when importing ssh-keys
+- #2477: @ebeigarts Fix dokku-redeploy systemd script to start only after docker
+- #2485: @znz Fix bug when VHOST file is missing newline
+- #2492: @josegonzalez Fix iteration on all apps for `dokku proxy` command
+- #2495: @josegonzalez Create the user's `authorized_keys` file if it does not exist
+- #2496: @josegonzalez Detect nginx versions that support HTTP/2 well
+- #2518: @josegonzalez Use same check for dockerfile apps during a tar build
+- #2526: @michaelshobbs Actually fail deploy when app.json script fails
+- #2539: @ebeigarts Fix dokku-installer.service removal
+
+### New Features
+
+- #2378: @knjcode Skip container finish processing when zero downtime is disabled
+- #2406: @josegonzalez Use apps_create method when renaming an application
+- #2419: @ebeigarts Support for CentOS 7
+- #2489: @joshmanders Add plugin uninstall trigger
+- #2510: @IlyaSemenov Add domains:set and domains:set-global commands
+- #2544: @michaelshobbs Update herokuish to 0.3.24
+- #2552: @josegonzalez Allow package building on OSX
+- #2553: @josegonzalez Add release-related Dockerfiles
+
+### Documentation
+
+- #2432: @josegonzalez Clarify DOKKU_SCALE docs
+- #2433: @alexgleason Add robots.txt plugin to community docs
+- #2437: @vishnubhagwan Fix warning in installation docs
+- #2451: @mbtamuli Document the logs plugin
+- #2470: @fteychene Add build-hook to plugins doc
+- #2472: @mainto Add dokku-access to plugins doc
+- #2484: @nahtnam Document build issues when a `Killed` message is displayed
+- #2486: @OmarShehata Fixing typo & broken link in docs
+- #2488: @joshmanders Bump font size in documentation
+- #2493: @josegonzalez Clarify checks documentation
+- #2497: @joshmanders Make features heading more clear
+- #2503: @mlebkowski Update dokku-acl plugin link
+- #2505: @kjschulz Add Dokku Wordpress plugin to docs
+- #2506: @simonkotwicz Fix typos in deployment docs
+- #2507: @josegonzalez Update upgrade docs to point out sshcommand and plugn upgrading as well
+- #2509: @kjschulz Map dokku-community user in plugins
+- #2511: @IlyaSemenov Clarify instructions for arranging default nginx site
+- #2515: @sgloutnikov Update DreamHost Cloud install instructions
+- #2517: @josegonzalez Update docs regarding if the ssh-keys plugin should be in use
+- #2522: @joshmanders Ensure install documentation can be run via copy-paste
+- #2525: @OmarShehata Plugin-triggers typo: dokkku -> dokku
+- #2531: @slava-vishnyakov Document rebuilding app after mounting storage
+- #2533: @facundomedica Document potential firewall problem on Ubuntu 16.04
+
+## 0.7.2
+
+This minor release contains mostly documentation changes, and should be fully backwards compatible with previous 0.7.x releases.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2392: @swg Specify python2 for get_json functions
+- #2408: @jcscottiii Use $DOKKU_VHOST_ENABLE instead of $VHOST_ENABLE in bootstrap.sh
+- #2417: @PWAckerman Remove extra quotes from DYNO environment variable
+- #2426: @michaelshobbs add force option on docker tag when available
+
+### New Features
+
+- #2418: @michaelshobbs Update to plugn 0.2.2
+- #2423: @michaelshobbs Update to herokuish 0.3.19
+
+### Documentation
+
+- #2393: @josegonzalez Deprecate all process manager plugins
+- #2394: @josegonzalez Deprecate old graphite plugin and add official graphite plugin
+- #2395: @josegonzalez Deprecate sekjun9878/redis
+- #2396: @josegonzalez Deprecate multi-buildpack plugin
+- #2397: @josegonzalez Update compatibility of dokku feature plugin
+- #2398: @josegonzalez Update compatibility of "other plugins"
+- #2404: @bascht Fix docker build syntax in image tags documentation
+- #2405: @josegonzalez Fully document the ps plugin
+- #2409: @josegonzalez Document caveats around ps:rebuild and tags/tar deployed applications
+- #2416: @njaxx Adds a mention of manually adding nginx entry
+- #2420: @c990802 Update command example for consistency
+- #2410: @IlyaSemenov Clarify domains help, improve domains unit tests
+- #2429: @enisozgen Minor documentation fixes
+- #2431: @josegonzalez Add missing redirect for deployment/deployment-tasks
+
+## 0.7.1
+
+### Bug Fixes
+
+- #2348: @josegonzalez Correct the version in use for ssh-keys
+- #2369: @u2mejc Fix ssh-keys:add permission error
+- #2377: @ebeigarts Do not use http_proxy env variables for CHECKS
+- #2360: @xadh00m Allow hyphen in TLD
+- #2387: @michaelshobbs Silence find warnings under Ubuntu 16.04
+- #2390: @josegonzalez Actually stop the dokku-installer service
+
+### New Features
+
+- #2358: @josegonzalez Guard against poodle vulnerability by default
+- #2385: @michaelshobbs Actually merge dokku-app-user into core
+
+### Documentation
+
+- #2337: @josegonzalez Update deprecated plugins list
+- #2352: @miguelcobain Fix typos in plugin-triggers docs
+- #2353: @miguelcobain Add a note about making plugins executable
+- #2345: @johnfraney Update list of officially supported distributions
+- #2354: @josegonzalez Dockerfile deploys do not support mounted volumes
+- #2371: @michaelshobbs Moved some plugin repos to michaelshobbs
+- #2381: @michaelshobbs Fail rest of bats file on first test failure
+- #2382: @alexgleason Fix typo "exampple" to "example"
+- #2386: @josegonzalez Add a migration guide for 0.7.0
+- #2388: @josegonzalez Add documentation for proxy ports scheme handling
+- #2389: @josegonzalez Add plugin management documentation
+
+
+## 0.7.0
+
+Another great minor release! There are no known backwards incompatibilities with this release, though the following may be of interest to our users:
+
+- #2316 #2326: Support for setting the correct user/group permissions on files stored in persistent storage
+- #2290: Container restart policy support in the core
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2302: @u2mejc Fix is_valid_hostname regex
+- #2331: @josegonzalez Fix repo plugin version
+- #2334: @josegonzalez Cleanup image retrieval
+- #2332: @josegonzalez Properly handle non-deployed applications during apps:rename
+
+### New Features
+
+- #2316: @michaelshobbs Use default privileged user in herokuish-0.3.17
+- #2335: @xtian Update herokuish to 0.3.18
+- #2317: @josegonzalez Properly remap http port 80 mappings to https 443 when adding an ssl certificate
+- #2290: @josegonzalez Implement restart-policy handling
+- #2287: @u2mejc Add ssh-keys core plugin
+- #2283: @xadh00m Add support for multiple global domains
+- #2277: @josegonzalez Add support for config values with double-quotes
+- #2273: @josegonzalez Add the ability to manually execute checks against an application
+
+### Documentation
+
+- #2308: @josegonzalez Clarify that nginx.conf.sigil is only extracted from repo root for buildpack applications
+- #2314: @dm-wyncode Add flags to apt-get command in unattended docs so that the installation is truly unattended
+- #2315: @smaffulli Adding DreamHost Cloud installation with cloud-init
+- #2325: @fanminjian Update to without -qq for proper Grub prompt.
+- #2326: @josegonzalez Document the user and group id to use for persistent storage permissions
+- #2336: @josegonzalez Clarify documentation
+
+## 0.6.5
+
+This was a big documentation release with a minor bugfix to the `app.json` functionality introduced in 0.5.0.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2301: @michaelshobbs Fix app.json extraction in dockerfile apps not using /app
+
+### New Features
+
+- #2297: @josegonzalez Add plugin trigger to override the image repository
+
+### Documentation
+
+- #2296: @josegonzalez Add an example plugin trigger for cache busting Dockerfile builds
+- #2295: @josegonzalez Add documentation for the apps, repo, and tar plugin
+- #2292: @josegonzalez General documentation cleanup
+- #2291: @josegonzalez Clean up documentation surrounding persistent storage
+- #2289: @PeterDaveHello Optimize png images using zopflipng
+- #2282: @prodicus Fixed link to sponsors doc
+
 ## 0.6.4
 
 Included in this release are a couple of bug fixes for existing features.
@@ -837,7 +1491,7 @@ Thanks to the *many* contributors for making this release our best release so fa
 - #1473: @josegonzalez Handle crashing containers by using restart=on-failure policy
 - #1476: @michaelshobbs Support static nginx port when deploying without an application VHOST
 - #1476: nginx proxy without VHOST
-- #1477: @arthurschreiber Support removing config variables that contain `\n`.
+- #1477: @arthurschreiber Support removing config variables containing newlines.
 
 ### Documentation
 
@@ -983,7 +1637,7 @@ This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `doc
 
 ### New Features
 
-- #1245: @arthurschreiber Support config variables containing `\n`
+- #1245: @arthurschreiber Support config variables containing newlines
 - #1257: @josegonzalez Split nginx ssl logs by $APP
 
 ### Bug Fixes

ISSUE_TEMPLATE.md

@@ -1,16 +1,11 @@
+> If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
+
 Description of problem:
 
 
 Output of the following commands
 
-- `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):
@@ -21,12 +16,12 @@ Output of the following commands
   - If using buildpacks, which custom buildpacks are in use
   - If using a `Dockerfile`, the contents of that file
   - If it exists, the contents of your `Procfile`.
-- Output of failing dokku commands after running `dokku trace on`
+- Output of failing Dokku commands after running `dokku trace on`
   (BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
 
 Environment details (AWS, VirtualBox, physical, etc.):
 
-How was dokku installed?:
+How was Dokku installed?:
 
 How reproducible:
 

Makefile

@@ -1,13 +1,14 @@
-DOKKU_VERSION = master
+DOKKU_VERSION ?= master
 
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.4.0/sshcommand
-PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
+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
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
 DOKKU_LIB_ROOT ?= /var/lib/dokku
 PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins
 CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins
+PLUGIN_MAKE_TARGET ?= build-in-docker
 
 # If the first argument is "vagrant-dokku"...
 ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
@@ -23,10 +24,13 @@ else
 	BUILD_STACK_TARGETS = build-in-docker
 endif
 
-.PHONY: all apt-update install version copyfiles man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku
+include common.mk
+
+.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
 
 include tests.mk
 include deb.mk
+include rpm.mk
 include arch.mk
 
 all:
@@ -34,44 +38,76 @@ all:
 
 install: dependencies version copyfiles plugin-dependencies plugins
 
-release: deb-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
 
 packer:
 	packer build contrib/packer.json
 
+go-build:
+	basedir=$(PWD); \
+	for dir in plugins/*; do \
+		if [ -e $$dir/Makefile ]; then \
+			$(MAKE) -e -C $$dir $(PLUGIN_MAKE_TARGET) || exit $$? ;\
+		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 \
+		if [ -e $$dir/Makefile ]; then \
+			$(MAKE) -e -C $$dir clean ;\
+		fi ;\
+	done
+
 copyfiles:
+	$(MAKE) go-build || exit 1
 	cp dokku /usr/local/bin/dokku
 	mkdir -p ${CORE_PLUGINS_PATH} ${PLUGINS_PATH}
 	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 && \
-		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
 
-addman: help2man
+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
 	mandb
 
 version:
+ifeq ($(DOKKU_VERSION),master)
 	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
+else
+	echo $(DOKKU_VERSION) > ~dokku/VERSION
+endif
 
 plugin-dependencies: plugn
 	sudo -E dokku plugin:install-dependencies --core
@@ -83,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
@@ -104,7 +140,7 @@ sigil:
 	wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
 	tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
 
-docker: aufs
+docker:
 	apt-get install -qq -y curl
 	egrep -i "^docker" /etc/group || groupadd docker
 	usermod -aG docker dokku
@@ -116,11 +152,6 @@ endif
 	sleep 2 # give docker a moment i guess
 endif
 
-aufs:
-ifndef CI
-	lsmod | grep aufs || modprobe aufs || apt-get install -qq -y linux-image-extra-`uname -r` > /dev/null
-endif
-
 stack:
 ifeq ($(shell test -e /var/run/docker.sock && touch -c /var/run/docker.sock && echo $$?),0)
 ifdef BUILD_STACK

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+**Note:** If this PR is just doc changes, please put [ci skip] in the body that way tests do not run.

README.md

@@ -1,42 +1,19 @@
-# Dokku [![Build Status](https://img.shields.io/circleci/project/dokku/dokku/master.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master) [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) [![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://glider-slackin.herokuapp.com/) [![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg?style=flat-square "Viewdocs")](http://dokku.viewdocs.io/dokku/)
+# Dokku
+[![Build Status](https://img.shields.io/circleci/project/dokku/dokku/master.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master)
+[![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku)
+[![Arch Package](https://img.shields.io/badge/package-arch-brightgreen.svg?style=flat-square "Arch Package")](https://aur.archlinux.org/packages/dokku/)
+[![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku)
+[![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://glider-slackin.herokuapp.com/)
+[![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.
 
-## Requirements
-
-- A fresh VM running Ubuntu `14.04 x64`
-
-## Installing
-
-To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
-
-    wget https://raw.githubusercontent.com/dokku/dokku/v0.6.4/bootstrap.sh
-    sudo DOKKU_TAG=v0.6.4 bash bootstrap.sh
-
-### Upgrading
-
-[View the docs for upgrading](http://dokku.viewdocs.io/dokku/upgrading) from an older version of Dokku.
-
-## Documentation
-
-Full documentation - including advanced installation docs - are available online at [docs](http://dokku.viewdocs.io/dokku/)
-
-## Support
-
-You can use [Github Issues](https://github.com/dokku/dokku/issues), check [Troubleshooting](http://dokku.viewdocs.io/dokku/troubleshooting) in the documentation, or join us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku)
-
-## Contribution
-
-After checking [Github Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](http://dokku.viewdocs.io/dokku/troubleshooting) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), feel free to fork and create a Pull Request.
-
-While we may not merge your PR as is, they serve to start conversations and improve the general dokku experience for all users.
-
 ## Sponsors
 
-See our list of past sponsors in the [SPONSORS](https://github.com/dokku/dokku/blob/master/SPONSORS) file.
+See our list of past sponsors in the [SPONSORS](https://github.com/dokku/dokku/blob/master/SPONSORS.md) file.
 
 Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/dokku#sponsor)]
 
@@ -107,6 +84,47 @@ Support us with a monthly donation and help us continue our activities. [[Become
 <a href="https://opencollective.com/dokku/backer/28/website" target="_blank"><img src="https://opencollective.com/dokku/backer/28/avatar.svg"></a>
 <a href="https://opencollective.com/dokku/backer/29/website" target="_blank"><img src="https://opencollective.com/dokku/backer/29/avatar.svg"></a>
 
+## Requirements
+
+A fresh VM running any of the following operating systems:
+
+- Ubuntu 16.04 x64
+- Ubuntu 14.04 x64
+- Debian 8.2 x64
+- CentOS 7 x64 *(experimental)*
+- Arch Linux x64 *(experimental)*
+
+## Installation
+
+To install the latest stable release, run the following commands as a user who has access to `sudo`:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.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.
+
+If you wish for a more unattended installation method, see [these](http://dokku.viewdocs.io/dokku/getting-started/install/debian/#unattended-installation) docs.
+
+### Upgrade
+
+[View the docs](http://dokku.viewdocs.io/dokku/getting-started/upgrading/) for upgrading from an older version of Dokku.
+
+## Documentation
+
+Full documentation - including advanced installation docs - are available online at [http://dokku.viewdocs.io/dokku/](http://dokku.viewdocs.io/dokku/).
+
+## Support
+
+You can use [Github Issues](https://github.com/dokku/dokku/issues), check [Troubleshooting](http://dokku.viewdocs.io/dokku/getting-started/troubleshooting/) in the documentation, or join us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku).
+
+## Contribution
+
+After checking [Github Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](http://dokku.viewdocs.io/dokku/getting-started/troubleshooting/) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), feel free to fork and create a Pull Request.
+
+While we may not merge your PR as is, they serve to start conversations and improve the general Dokku experience for all users.
+
 ## License
 
 [MIT License](https://github.com/dokku/dokku/blob/master/LICENSE) © Jeff Lindsay

SPONSORS.md

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

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|
@@ -76,13 +78,22 @@ Vagrant::configure("2") do |config|
     vm.vm.provision :shell, :inline => "cd /root/dokku && make install-from-deb"
   end
 
+  config.vm.define "dokku-rpm", autostart: false do |vm|
+    vm.vm.box = "centos/7"
+    vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
+    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 => "cd /root/dokku && bash bootstrap.sh"
+  end
+
   config.vm.define "build", autostart: false do |vm|
     vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
-    vm.vm.provision :shell, :inline => "export IS_RELEASE=true && cd /root/dokku && make deb-all"
+    vm.vm.provision :shell, :inline => "export IS_RELEASE=true && cd /root/dokku && make deb-all rpm-all"
   end
 
   config.vm.define "build-arch", autostart: false do |vm|

arch.mk

@@ -22,7 +22,11 @@ arch-setup:
 
 arch-dokku: arch-setup
 	echo "-> Update package sums, create metadata file and test the build of the package"
+ifeq ($(DOKKU_VERSION),master)
 	git describe --tags > /tmp/VERSION
+else
+	echo $(DOKKU_VERSION) > /tmp/VERSION
+endif
 	cat /tmp/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/STABLE_VERSION
 	sed -i -e "s/pkgver=.*/pkgver=`cat /tmp/STABLE_VERSION`/" /dokku-arch/PKGBUILD
 	cd /dokku-arch; updpkgsums; mksrcinfo; makepkg -fd

bootstrap.sh

@@ -14,10 +14,6 @@ set -eo pipefail; [[ $TRACE ]] && set -x
 ensure-environment() {
   local FREE_MEMORY
   echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
-  if ! command -v apt-get &>/dev/null; then
-    echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
-    exit 1
-  fi
 
   hostname -f > /dev/null 2>&1 || {
     echo "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
@@ -33,10 +29,12 @@ ensure-environment() {
 
 install-requirements() {
   echo "--> Ensuring we have the proper dependencies"
-  apt-get update -qq > /dev/null
-  if [[ $(lsb_release -sr) == "12.04" ]]; then
-    apt-get -qq -y install python-software-properties
-  fi
+
+  case "$DOKKU_DISTRO" in
+    debian|ubuntu)
+      apt-get update -qq > /dev/null
+      ;;
+  esac
 }
 
 install-dokku() {
@@ -48,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
@@ -68,9 +73,14 @@ install-dokku() {
   fi
 }
 
-
 install-dokku-from-source() {
   local DOKKU_CHECKOUT="$1"
+
+  if ! command -v apt-get &>/dev/null; then
+    echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
+    exit 1
+  fi
+
   apt-get -qq -y install git make software-properties-common
   cd /root
   if [[ ! -d /root/dokku ]]; then
@@ -84,8 +94,34 @@ install-dokku-from-source() {
 }
 
 install-dokku-from-package() {
+  case "$DOKKU_DISTRO" in
+    debian|ubuntu)
+      install-dokku-from-deb-package "$@"
+      ;;
+    centos|rhel)
+      install-dokku-from-rpm-package "$@"
+      ;;
+    *)
+      echo "Unsupported Linux distribution. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
+      exit 1
+      ;;
+  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 "
@@ -97,19 +133,42 @@ install-dokku-from-package() {
 
   echo "--> Installing docker"
   if uname -r | grep -q linode; then
-    echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
-    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
+    echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
+    echo "    You can safely ignore this warning."
     echo "    Installation will continue in 10 seconds."
     sleep 10
   fi
   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 $VHOST_ENABLE"         | sudo debconf-set-selections
+  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE"   | sudo debconf-set-selections
   [[ -n $DOKKU_WEB_CONFIG ]]    && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG"       | sudo debconf-set-selections
   [[ -n $DOKKU_HOSTNAME ]]      && echo "dokku dokku/hostname string $DOKKU_HOSTNAME"            | sudo debconf-set-selections
   [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
@@ -124,7 +183,43 @@ install-dokku-from-package() {
   fi
 }
 
+install-dokku-from-rpm-package() {
+  local DOKKU_CHECKOUT="$1"
+
+  if [[ "$DOKKU_DISTRO_VERSION" != "7" ]]; then
+    echo "Only CentOS version 7 is supported."
+    exit 1
+  fi
+
+  echo "--> Installing docker"
+  curl -fsSL https://get.docker.com/ | sh
+
+  echo "--> Installing epel for nginx packages to be available"
+  yum install -y epel-release
+
+  echo "--> Installing herokuish and dokku"
+  curl -s https://packagecloud.io/install/repositories/dokku/dokku/script.rpm.sh | bash
+  if [[ -n $DOKKU_CHECKOUT ]]; then
+    yum -y install herokuish "dokku-$DOKKU_CHECKOUT"
+  else
+    yum -y install herokuish dokku
+  fi
+
+  echo "--> Enabling docker and nginx on system startup"
+  systemctl enable docker
+  systemctl enable nginx
+
+  echo "--> Starting nginx"
+  systemctl start nginx
+}
+
 main() {
+  export DOKKU_DISTRO DOKKU_DISTRO_VERSION
+  # shellcheck disable=SC1091
+  DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
+  # shellcheck disable=SC1091
+  DOKKU_DISTRO_VERSION=$(. /etc/os-release && echo "$VERSION_ID")
+
   export DEBIAN_FRONTEND=noninteractive
   export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/dokku/dokku.git"}
 

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

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

contrib/build.Dockerfile

@@ -0,0 +1,45 @@
+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 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 \
+    && cp /usr/local/go/bin/* /usr/local/bin
+
+ARG WORKDIR=/go/src/github.com/dokku/dokku
+
+WORKDIR ${WORKDIR}
+
+COPY Makefile ${WORKDIR}/
+COPY *.mk ${WORKDIR}/
+
+RUN make deb-setup rpm-setup sshcommand plugn
+
+COPY . ${WORKDIR}
+
+ARG PLUGIN_MAKE_TARGET
+ARG DOKKU_VERSION=master
+ARG DOKKU_GIT_REV
+ARG IS_RELEASE=false
+
+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 deb-dokku-update \
+            rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update
+
+RUN mkdir -p /data \
+    && cp /tmp/*.deb /data \
+    && cp /tmp/*.rpm /data \
+    && ls -lha /data/

contrib/dokku-installer.py

@@ -3,13 +3,14 @@
 import cgi
 import json
 import os
+import re
 import SimpleHTTPServer
 import SocketServer
 import subprocess
 import sys
 import threading
 
-VERSION = 'v0.6.4'
+VERSION = 'v0.12.2'
 
 hostname = ''
 try:
@@ -100,8 +101,20 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
             f.write(params['hostname'].value)
 
-        command = ['sshcommand', 'acl-add', 'dokku', 'admin']
-        for key in params['keys'].value.split("\n"):
+        for (index, key) in enumerate(params['keys'].value.splitlines(), 1):
+            user = 'admin'
+            if self.admin_user_exists() is not None:
+                user = 'web-admin'
+                if self.web_admin_user_exists() is not None:
+                    index = int(self.web_admin_user_exists()) + 1
+                elif self.web_admin_user_exists() is None:
+                    index = 1
+            elif self.admin_user_exists() is None:
+                pass
+            else:
+                index = int(self.admin_user_exists()) + 1
+            user = user + str(index)
+            command = ['sshcommand', 'acl-add', 'dokku', user]
             proc = subprocess.Popen(command, stdin=subprocess.PIPE)
             proc.stdin.write(key)
             proc.stdin.close()
@@ -119,6 +132,29 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         self.end_headers()
         self.wfile.write(json.dumps({'status': 'ok'}))
 
+    def web_admin_user_exists(self):
+        return self.user_exists('web-admin(\d+)')
+
+    def admin_user_exists(self):
+        return self.user_exists('admin(\d+)')
+
+    def user_exists(self, name):
+        command = 'dokku ssh-keys:list'
+        pattern = re.compile(r'NAME="' + name + '"')
+        proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
+        max_num = 0
+        exists = False
+        for line in proc.stdout:
+            m = pattern.search(line)
+            if m:
+                # User of the form `user` or `user#` exists
+                exists = True
+                max_num = max(max_num, m.group(1))
+        if exists:
+            return max_num
+        else:
+            return None
+
 
 def set_debconf_selection(debconf_type, key, value):
     found = False
@@ -155,7 +191,7 @@ class DeleteInstallerThread(object):
         except:
             pass
 
-        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && stop dokku-installer"
+        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && (stop dokku-installer || systemctl stop dokku-installer.service)"
         try:
             subprocess.call(command, shell=True)
         except:
@@ -218,7 +254,7 @@ PAGE = """
       $.post('/setup', data)
         .done(function() {
           $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/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/dokku_client.sh

@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+export DOKKU_PORT=${DOKKU_PORT:=22}
+export DOKKU_HOST=${DOKKU_HOST:=}
 
-MOVES=(ABLE ABNORMA AGAIN AIREXPL ANG ANGER ASAIL ATTACK AURORA AWL BAN BAND BARE BEAT BEATED BELLY BIND BITE BLOC BLOOD BODY BOOK BREATH BUMP CAST CHAM CLAMP CLAP CLAW CLEAR CLI CLIP CLOUD CONTRO CONVY COOLHIT CRASH CRY CUT DESCRI D-FIGHT DIG DITCH DIV DOZ DRE DUL DU-PIN DYE EARTH EDU EG-BOMB EGG ELEGY ELE-HIT EMBODY EMPLI ENGL ERUPT EVENS EXPLOR EYES FALL FAST F-CAR F-DANCE FEARS F-FIGHT FIGHT FIR FIRE FIREHIT FLAME FLAP FLASH FLEW FORCE FRA FREEZE FROG G-BIRD GENKISS GIFT G-KISS G-MOUSE GRADE GROW HAMMER HARD HAT HATE H-BOMB HELL-R HEMP HINT HIT HU HUNT HYPNOSI INHA IRO IRONBAR IR-WING J-GUN KEE KICK KNIF KNIFE KNOCK LEVEL LIGH LIGHHIT LIGHT LIVE L-WALL MAD MAJUS MEL MELO MESS MILK MIMI MISS MIXING MOVE MUD NI-BED NOISY NOONLI NULL N-WAVE PAT PEACE PIN PLAN PLANE POIS POL POWDE POWE POWER PRIZE PROTECT PROUD RAGE RECOR REFLAC REFREC REGR RELIV RENEW R-FIGHT RING RKICK ROCK ROUND RUS RUSH SAND SAW SCISSOR SCRA SCRIPT SEEN SERVER SHADOW SHELL SHINE SHO SIGHT SIN SMALL SMELT SMOK SNAKE SNO SNOW SOU SO-WAVE SPAR SPEC SPID S-PIN SPRA STAM STARE STEA STONE STORM STRU STRUG STUDEN SUBS SUCID SUN-LIG SUNRIS SUPLY S-WAVE TAILS TANGL TASTE TELLI THANK TONKICK TOOTH TORL TRAIN TRIKICK TUNGE VOLT WA-GUN WATCH WAVE W-BOMB WFALL WFING WHIP WHIRL WIND WOLF WOOD WOR YUJA)
-NAMES=(SEED GRASS FLOWE SHAD CABR SNAKE GOLD COW GUIKI PEDAL DELAN B-FLY BIDE KEYU FORK LAP PIGE PIJIA CAML LAT BIRD BABOO VIV ABOKE PIKAQ RYE SAN BREAD LIDEL LIDE PIP PIKEX ROK JUGEN PUD BUDE ZHIB GELU GRAS FLOW LAFUL ATH BALA CORN MOLUF DESP DAKED MIMI BOLUX KODA GELUD MONK SUMOY GEDI WENDI NILEM NILE NILEC KEZI YONGL HUDE WANLI GELI GUAIL MADAQ WUCI WUCI MUJEF JELLY SICIB GELU NELUO BOLI JIALE YED YEDE CLO SCARE AOCO DEDE DEDEI BAWU JIUG BADEB BADEB HOLE BALUX GES FANT QUAR YIHE SWAB SLIPP CLU DEPOS BILIY YUANO SOME NO YELA EMPT ZECUN XIAHE BOLEL DEJI MACID XIHON XITO LUCK MENJI GELU DECI XIDE DASAJ DONGN RICUL MINXI BALIY ZENDA LUZEL HELE5 0FENB KAIL JIAND CARP JINDE LAPU MUDE YIFU LINLI SANDI HUSI JINC OUMU OUMUX CAP KUIZA PUD TIAO FRMAN CLAU SPARK DRAGO BOLIU GUAIL MIYOU MIY QIAOK BEIL MUKEI RIDED MADAM BAGEP CROC ALIGE OUDAL OUD DADA HEHE YEDEA NUXI NUXIN ROUY ALIAD STICK QIANG LAAND PIQI PI PUPI DEKE DEKEJ NADI NADIO MALI PEA ELECT FLOWE MAL MALI HUSHU NILEE YUZI POPOZ DUZI HEBA XIAN SHAN YEYEA WUY LUO KEFE HULA CROW YADEH MOW ANNAN SUONI KYLI HULU HUDEL YEHE GULAE YEHE BLU GELAN BOAT NIP POIT HELAK XINL BEAR LINB MAGEH MAGEJ WULI YIDE RIVE FISH AOGU DELIE MANTE KONMU DELU HELU HUAN HUMA DONGF JINCA HEDE DEFU LIBY JIAPA MEJI HELE BUHU MILK HABI THUN GARD DON YANGQ SANAQ BANQ LUJ PHIX SIEI EGG)
-
-random_number() {
+fn-random-number() {
   [[ -n "$1" ]] && RANGE="$1"
   if [[ -n "$RANGE" ]]; then
     number=$RANDOM
@@ -15,94 +14,141 @@ random_number() {
   echo $number
 }
 
-random_name() {
- NUM1=$(random_number ${#MOVES[@]})
- NUM2=$(random_number ${#MOVES[@]})
- NUM3=$(random_number ${#NAMES[@]})
+fn-random-name() {
+  local NUM1 NUM2 NUM3 UPPER_APPNAME lower_appname
+  local MOVES=(ABLE ABNORMA AGAIN AIREXPL ANG ANGER ASAIL ATTACK AURORA AWL BAN BAND BARE BEAT BEATED BELLY BIND BITE BLOC BLOOD BODY BOOK BREATH BUMP CAST CHAM CLAMP CLAP CLAW CLEAR CLI CLIP CLOUD CONTRO CONVY COOLHIT CRASH CRY CUT DESCRI D-FIGHT DIG DITCH DIV DOZ DRE DUL DU-PIN DYE EARTH EDU EG-BOMB EGG ELEGY ELE-HIT EMBODY EMPLI ENGL ERUPT EVENS EXPLOR EYES FALL FAST F-CAR F-DANCE FEARS F-FIGHT FIGHT FIR FIRE FIREHIT FLAME FLAP FLASH FLEW FORCE FRA FREEZE FROG G-BIRD GENKISS GIFT G-KISS G-MOUSE GRADE GROW HAMMER HARD HAT HATE H-BOMB HELL-R HEMP HINT HIT HU HUNT HYPNOSI INHA IRO IRONBAR IR-WING J-GUN KEE KICK KNIF KNIFE KNOCK LEVEL LIGH LIGHHIT LIGHT LIVE L-WALL MAD MAJUS MEL MELO MESS MILK MIMI MISS MIXING MOVE MUD NI-BED NOISY NOONLI NULL N-WAVE PAT PEACE PIN PLAN PLANE POIS POL POWDE POWE POWER PRIZE PROTECT PROUD RAGE RECOR REFLAC REFREC REGR RELIV RENEW R-FIGHT RING RKICK ROCK ROUND RUS RUSH SAND SAW SCISSOR SCRA SCRIPT SEEN SERVER SHADOW SHELL SHINE SHO SIGHT SIN SMALL SMELT SMOK SNAKE SNO SNOW SOU SO-WAVE SPAR SPEC SPID S-PIN SPRA STAM STARE STEA STONE STORM STRU STRUG STUDEN SUBS SUCID SUN-LIG SUNRIS SUPLY S-WAVE TAILS TANGL TASTE TELLI THANK TONKICK TOOTH TORL TRAIN TRIKICK TUNGE VOLT WA-GUN WATCH WAVE W-BOMB WFALL WFING WHIP WHIRL WIND WOLF WOOD WOR YUJA)
+  local NAMES=(SEED GRASS FLOWE SHAD CABR SNAKE GOLD COW GUIKI PEDAL DELAN B-FLY BIDE KEYU FORK LAP PIGE PIJIA CAML LAT BIRD BABOO VIV ABOKE PIKAQ RYE SAN BREAD LIDEL LIDE PIP PIKEX ROK JUGEN PUD BUDE ZHIB GELU GRAS FLOW LAFUL ATH BALA CORN MOLUF DESP DAKED MIMI BOLUX KODA GELUD MONK SUMOY GEDI WENDI NILEM NILE NILEC KEZI YONGL HUDE WANLI GELI GUAIL MADAQ WUCI WUCI MUJEF JELLY SICIB GELU NELUO BOLI JIALE YED YEDE CLO SCARE AOCO DEDE DEDEI BAWU JIUG BADEB BADEB HOLE BALUX GES FANT QUAR YIHE SWAB SLIPP CLU DEPOS BILIY YUANO SOME NO YELA EMPT ZECUN XIAHE BOLEL DEJI MACID XIHON XITO LUCK MENJI GELU DECI XIDE DASAJ DONGN RICUL MINXI BALIY ZENDA LUZEL HELE5 0FENB KAIL JIAND CARP JINDE LAPU MUDE YIFU LINLI SANDI HUSI JINC OUMU OUMUX CAP KUIZA PUD TIAO FRMAN CLAU SPARK DRAGO BOLIU GUAIL MIYOU MIY QIAOK BEIL MUKEI RIDED MADAM BAGEP CROC ALIGE OUDAL OUD DADA HEHE YEDEA NUXI NUXIN ROUY ALIAD STICK QIANG LAAND PIQI PI PUPI DEKE DEKEJ NADI NADIO MALI PEA ELECT FLOWE MAL MALI HUSHU NILEE YUZI POPOZ DUZI HEBA XIAN SHAN YEYEA WUY LUO KEFE HULA CROW YADEH MOW ANNAN SUONI KYLI HULU HUDEL YEHE GULAE YEHE BLU GELAN BOAT NIP POIT HELAK XINL BEAR LINB MAGEH MAGEJ WULI YIDE RIVE FISH AOGU DELIE MANTE KONMU DELU HELU HUAN HUMA DONGF JINCA HEDE DEFU LIBY JIAPA MEJI HELE BUHU MILK HABI THUN GARD DON YANGQ SANAQ BANQ LUJ PHIX SIEI EGG)
 
- UPPER_APPNAME="${MOVES[${NUM1}]}-${MOVES[${NUM2}]}-${NAMES[${NUM3}]}"
+  NUM1=$(fn-random-number ${#MOVES[@]})
+  NUM2=$(fn-random-number ${#MOVES[@]})
+  NUM3=$(fn-random-number ${#NAMES[@]})
 
- [[ "$BASH_VERSION" =~ 4.* ]] && lower_appname=${UPPER_APPNAME,,}
- [[ -z "$lower_appname" ]] && lower_appname=$(echo "$UPPER_APPNAME" | tr '[:upper:]' '[:lower:]')
- echo "$lower_appname"
+  UPPER_APPNAME="${MOVES[${NUM1}]}-${MOVES[${NUM2}]}-${NAMES[${NUM3}]}"
+
+  [[ "$BASH_VERSION" =~ 4.* ]] && lower_appname=${UPPER_APPNAME,,}
+  [[ -z "$lower_appname" ]] && lower_appname=$(echo "$UPPER_APPNAME" | tr '[:upper:]' '[:lower:]')
+  echo "$lower_appname"
 }
 
-client_help_msg() {
-  echo "==> Configure the DOKKU_HOST environment variable or run $0 from a repository with a git remote named dokku"
-  echo "--> i.e. git remote add dokku dokku@<dokku-host>:<app-name>"
+fn-client-help-msg() {
+  echo "==> Configure the DOKKU_HOST environment variable or run $0 from a repository with a git remote named dokku" 1>&2
+  echo "--> i.e. git remote add dokku dokku@<dokku-host>:<app-name>" 1>&2
   exit 20 # exit with specific status. only used in units tests for now
 }
 
-is_git_repo() {
-    git rev-parse &>/dev/null
+fn-is-git-repo() {
+  git rev-parse &>/dev/null
 }
 
-has_dokku_remote() {
-    git remote show | grep dokku
+fn-has-dokku-remote() {
+  git remote show | grep -E "^${DOKKU_GIT_REMOTE}\s"
 }
 
-if [[ -z $DOKKU_HOST ]]; then
-  if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
-    DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^dokku" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
-  else
-    client_help_msg
+fn-dokku-host() {
+  declare DOKKU_GIT_REMOTE="$1" DOKKU_HOST="$2"
+
+  if [[ -z "$DOKKU_HOST" ]]; then
+    if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
+      DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^${DOKKU_GIT_REMOTE}\s" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
+    fi
   fi
-fi
 
-export DOKKU_PORT=${DOKKU_PORT:=22}
+  if [[ -z "$DOKKU_HOST" ]]; then
+    fn-client-help-msg
+  fi
 
-if [[ ! -z $DOKKU_HOST ]]; then
-  _dokku() {
-    appname=""
+  echo "$DOKKU_HOST"
+}
+
+main() {
+  declare CMD="$1" APP_ARG="$2"
+  local APP="" DOKKU_GIT_REMOTE="dokku" DOKKU_REMOTE_HOST=""
+  local cmd_set=false next_index=1 skip=false args=("$@")
+
+  for arg in "$@"; do
+    if [[ "$skip" == "true" ]]; then
+      next_index=$(( next_index + 1 ))
+      skip=false
+      continue
+    fi
+
+    if [[ "$arg" == "--app" ]]; then
+      APP=${args[$next_index]}
+      skip=true
+      shift 2
+    elif [[ "$arg" == "--remote" ]]; then
+      DOKKU_GIT_REMOTE=${args[$next_index]}
+      skip=true
+      shift 2
+    elif [[ "$arg" =~ ^--.* ]]; then
+      [[ "$cmd_set" == "true" ]] && APP_ARG="$arg" && break
+      [[ "$arg" == "--trace" ]] && export DOKKU_TRACE=1 && set -x
+    else
+      if [[ "$cmd_set" == "true" ]]; then
+        APP_ARG="$arg"
+        break
+      else
+        CMD="$arg"
+        cmd_set=true
+      fi
+    fi
+    next_index=$(( next_index + 1 ))
+  done
+
+  DOKKU_REMOTE_HOST="$(fn-dokku-host "$DOKKU_GIT_REMOTE" "$DOKKU_HOST")"
+
+  if [[ -z "$APP" ]]; then
     if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
       set +e
-      appname=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
+      APP=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_REMOTE_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
       set -e
     else
       echo "This is not a git repository"
     fi
-
-    case "$1" in
-      apps:create)
-        if [[ -z "$2" ]]; then
-          appname=$(random_name)
-          counter=0
-          while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
-            if [[ $counter -ge 100 ]]; then
-              echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
-              ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps
-              exit 1
-            else
-              appname=$(random_name)
-              counter=$((counter+1))
-            fi
-          done
-        else
-          appname="$2"
-        fi
-        if git remote add dokku "dokku@$DOKKU_HOST:$appname"; then
-          echo "-----> Dokku remote added at $DOKKU_HOST"
-          echo "-----> Application name is $appname"
-        else
-          echo "!      Dokku remote not added! Do you already have a dokku remote?"
-          return
-        fi
-        ;;
-    apps:destroy)
-      is_git_repo && has_dokku_remote && git remote remove dokku
-      ;;
-    esac
-
-    [[ -n "$@" ]] && [[ -n "$appname" ]] && app_arg="--app $appname"
-    # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@"
-    # shellcheck disable=SC2068,SC2086
-    ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@
-  }
-
-  if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
-    _dokku "$@"
-    exit $?
   fi
-else
-  client_help_msg
+
+  case "$CMD" in
+    apps:create)
+      if [[ -z "$APP_ARG" ]]; then
+        APP=$(fn-random-name)
+        counter=0
+        while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null| grep -q "$APP"; do
+          if [[ $counter -ge 100 ]]; then
+            echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
+            ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps
+            exit 1
+          else
+            APP=$(random_name)
+            counter=$((counter+1))
+          fi
+        done
+      else
+        APP="$APP_ARG"
+      fi
+      if git remote add "$DOKKU_GIT_REMOTE" "dokku@$DOKKU_REMOTE_HOST:$APP"; then
+        echo "-----> Dokku remote added at ${DOKKU_REMOTE_HOST} called ${DOKKU_GIT_REMOTE}"
+        echo "-----> Application name is ${APP}"
+      else
+        echo "!      Dokku remote not added! Do you already have a dokku remote?"
+        return
+      fi
+      ;;
+    apps:destroy)
+      fn-is-git-repo && fn-has-dokku-remote && git remote remove "$DOKKU_GIT_REMOTE"
+      ;;
+  esac
+
+  [[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
+  [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore " == *" $CMD "* ]] && unset APP
+  [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
+  [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
+  [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
+  # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@"
+  # shellcheck disable=SC2068,SC2086
+  ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@
+}
+
+if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
+  main "$@"
+  exit $?
 fi

contrib/release

@@ -0,0 +1,344 @@
+#!/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"
+  declare IS_RELEASE="$1" DOKKU_VERSION="$2"
+  local NAME GOLANG_VERSION
+
+  if [[ -z "$DOKKU_VERSION" ]]; then
+    log-error "Invalid deb file specified"
+    return 1
+  fi
+
+  NAME="dokku:build"
+  [[ "$IS_RELEASE" == "true" ]] && NAME="dokku:build-release"
+  [[ -n "$DOKKU_VERSION" ]] || DOKKU_VERSION="master"
+
+  pushd "$ROOT_DIR" >/dev/null
+  GOLANG_VERSION="$(grep BUILD_IMAGE common.mk | cut -d' ' -f3 | cut -d':' -f2)"
+  docker build \
+    --build-arg DOKKU_VERSION="$DOKKU_VERSION" \
+    --build-arg DOKKU_GIT_REV="$DOKKU_GIT_REV" \
+    --build-arg IS_RELEASE="$IS_RELEASE" \
+    --build-arg PLUGIN_MAKE_TARGET="build" \
+    --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
+    -f "contrib/build.Dockerfile" \
+    -t "$NAME" .
+  return "$?"
+}
+
+fn-extract-package() {
+  declare desc="Extract packages from a docker container to the root directory"
+  declare IS_RELEASE="$1" PACKAGE_NAME="$2"
+  local NAME
+
+  if [[ -z "$PACKAGE_NAME" ]]; then
+    log-error "Invalid deb file specified"
+    return 1
+  fi
+
+  NAME="dokku:build"
+  [[ "$IS_RELEASE" == "true" ]] && NAME="dokku:build-release"
+
+  log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
+  docker run --rm --entrypoint cat "$NAME" "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  return "$?"
+}
+
+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-version-current() {
+  declare desc="Retrieves the current version of dokku"
+  pushd "$ROOT_DIR" >/dev/null
+  grep Version debian/control | cut -d' ' -f2
+}
+
+fn-version-next() {
+  declare desc="Calculates the next version name of dokku"
+  declare CURRENT_VERSION="$1" RELEASE="$2"
+  local major minor patch short_object
+
+  major=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[1]}')
+  minor=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[2]}')
+  patch=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[3]}')
+
+  if [[ "$RELEASE" == "major" ]]; then
+    major=$((major + 1))
+    minor="0"
+    patch="0"
+  elif [[ "$RELEASE" == "minor" ]]; then
+    minor=$((minor + 1))
+    patch="0"
+  elif [[ "$RELEASE" == "patch" ]]; then
+    patch=$((patch + 1))
+  else
+    short_object=$(git log --oneline | tail -n 1 | cut -d' ' -f1)
+    echo "${CURRENT_VERSION}build+$(echo "$DOKKU_GIT_REV" | cut -c1-${#short_object})"
+    return 0
+  fi
+
+  echo "${major}.${minor}.${patch}"
+}
+
+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 EXIT_CODE=0
+  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) 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() {
+  declare desc="Replaces the version within a file"
+  local CURRENT_VERSION="$1"
+  local NEXT_VERSION="$2"
+  local FILENAME="$3"
+  sed -i.bak "s/${CURRENT_VERSION//./\.}/$NEXT_VERSION/g" "$FILENAME" && rm "$FILENAME.bak"
+  git add "$FILENAME"
+}
+
+fn-repo-merged-requests() {
+  declare desc="Retrieves all pull request ids since a given release of dokku"
+  declare TAG="$1"
+  git log "v${TAG}..HEAD" --oneline | grep "Merge pull request" | cut -d' ' -f 5 | cut -d '#' -f2
+}
+
+fn-repo-push-tags() {
+  declare desc="Pushes tags and the repository to github"
+  declare IS_RELEASE="$1"
+
+  if [[ "$IS_RELEASE" == "false" ]]; then
+    return
+  fi
+
+  pushd "$ROOT_DIR" >/dev/null
+  git push --tags origin master
+}
+
+fn-repo-update() {
+  declare desc="Updates files within the repository for a given release"
+  declare IS_RELEASE="$1" CURRENT_VERSION="$2" NEXT_VERSION="$3"
+
+  log-info "(release-dokku) Replacing ${CURRENT_VERSION} with ${NEXT_VERSION}"
+  for f in plugins/*/plugin.toml; do
+    fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" "$f"
+  done
+
+  if [[ "$IS_RELEASE" == "false" ]]; then
+    return
+  fi
+
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" contrib/dokku-installer.py
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" debian/control
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/advanced-usage/plugin-management.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/favicons/browserconfig.xml
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/favicons/manifest.json
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/style.css
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/development/release-process.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/home.html
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md
+
+  if [[ "$RELEASE" == 'patch' ]]; then
+    fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json
+  else
+    versions=$(python -c 'import json,sys;d=json.load(sys.stdin);d["max-versions"].append("'"${NEXT_VERSION}"'"); print json.dumps(d, indent=2, sort_keys=True)' <docs/assets/versions.json)
+    echo "$versions" >docs/assets/versions.json
+    git add docs/assets/versions.json
+  fi
+
+  if [[ "$IS_RELEASE" == "false" ]]; then
+    return
+  fi
+
+  log-info "(release-dokku) Adding HISTORY.md, committing and tagging"
+  fn-repo-update-history-and-commit "$CURRENT_VERSION" "$NEXT_VERSION"
+  git tag "v${NEXT_VERSION}"
+}
+
+fn-repo-update-history-and-commit() {
+  declare desc="Updates the history file and commits the changes"
+  declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
+  local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
+  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG ISSUE_FILE
+
+  pushd "$ROOT_DIR" >/dev/null
+
+  mkdir -p /tmp/github-data
+
+  for PULL_REQUEST_ID in $(fn-repo-merged-requests "$CURRENT_VERSION"); do
+    ISSUE_FILE="/tmp/github-data/${PULL_REQUEST_ID}.json"
+    if [[ ! -f "$ISSUE_FILE" ]]; then
+      curl -sS "https://api.github.com/repos/dokku/dokku/issues/${PULL_REQUEST_ID}" >"$ISSUE_FILE"
+    fi
+
+    TITLE="$(jq -r '.title' "$ISSUE_FILE")"
+    AUTHOR="$(jq -r '.user.login' "$ISSUE_FILE")"
+    TYPE="$(jq -r '.labels[] | select( .name | contains("type") ) | .name' "$ISSUE_FILE" | cut -d' ' -f2)"
+    CHANGELOG_TEXT="- #${PULL_REQUEST_ID}: @${AUTHOR} ${TITLE}"
+
+    if [[ "$TYPE" == "bug" ]]; then
+      HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "documentation" ]]; then
+      HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "enhancement" ]]; then
+      HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
+    fi
+  done
+
+  HISTORY="# History"
+  HISTORY="${HISTORY}"$'\n\n'"## ${NEXT_VERSION}"
+
+  if [[ "$HISTORY_BUG" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Bug Fixes"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_BUG"
+  fi
+
+  if [[ "$HISTORY_ENHANCEMENT" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### New Features"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_ENHANCEMENT"
+  fi
+
+  if [[ "$HISTORY_DOCUMENTATION" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Documentation"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION"
+  fi
+
+  sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak
+  HISTORY_CONTENTS="$(cat HISTORY.md)"
+  echo -e "$HISTORY\n$HISTORY_CONTENTS" >HISTORY.md
+  git add HISTORY.md
+
+  COMMIT_MESSAGE="Release ${NEXT_VERSION}"$'\n\n'"${HISTORY}"
+  git commit -m "${COMMIT_MESSAGE}"
+}
+
+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 CURRENT_VERSION NEXT_VERSION IS_RELEASE
+  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 "git"
+  fn-require-bin "package_cloud"
+  [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
+
+  CURRENT_VERSION="$(fn-version-current)"
+  NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
+
+  fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
+
+  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
+
+  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
+
+  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+
+  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"
+}
+
+main "$@"

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/release-plugin

@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $TRACE ]] && set -x
+
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXX")"
+
+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-github-download-release() {
+  declare REPO_NAME="$1" VERSION="$2"
+
+  if [[ -n "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+    curl -L "https://api.github.com/repos/${REPO_NAME}/tarball/${VERSION}?access_token=${DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN}"
+  else
+    curl -L "https://api.github.com/repos/${REPO_NAME}/tarball/${VERSION}"
+  fi
+}
+
+fn-replace-version() {
+  declare desc="Replaces the version within a file"
+  local CURRENT_VERSION="$1"
+  local NEXT_VERSION="$2"
+  local FILENAME="$3"
+  sed -i.bak "s/${CURRENT_VERSION//./\.}/$NEXT_VERSION/g" "$FILENAME" && rm "$FILENAME.bak"
+  git add "$FILENAME"
+}
+
+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() {
+  local RELEASE="$1"
+  local CURRENT_VERSION FILENAME NEXT_VERSION ORG_REPO_NAME REPO_NAME major minor patch
+
+  if [[ -z "$RELEASE" ]]; then
+    cat<<'EOF'
+requirements:
+
+- this is run in a plugin folder
+- a `plugin.toml` exists
+- the plugin is versioned via git
+
+usage:
+
+    # the following commands make these assumptions
+    # - the plugin's folder name is dokku-example, as is the remote repository
+    # - the current version is `0.0.1` in the `plugin.toml`
+
+    # create the alias
+    alias release-dokku-plugin="path/to/dokku/contrib/release-plugin"
+
+    # make a specific kind of release
+    release-dokku-plugin patch # creates a 0.0.2 release
+    release-dokku-plugin minor # creates a 0.1.0 release
+    release-dokku-plugin major # creates a 1.0.0 release
+
+    # release private plugins as tarballs to S3
+    # note that the plugin *must* exist on github for this to work
+    export DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN="some-github-token"
+    export DOKKU_PLUGIN_S3_BUCKET="example"
+    export DOKKU_PLUGIN_S3_PATH="some/path"
+    # will upload the versioned tarball url to s3://example/some/path/dokku-plugin-name-0.0.1.tar.gz
+    release-dokku-plugin patch
+EOF
+    return
+  fi
+
+  fn-require-bin "git"
+
+  if [[ "$CI" != "true" ]] && [[ -z "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+    log-info "You are running this without a DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN environment variable."
+    log-info "Doing so disables uploading releases to S3, which may be necessary for installing private plugins."
+    while true; do
+      read -rp "Do you wish to continue? " yn
+      case $yn in
+          [Yy]* ) break;;
+          [Nn]* ) exit;;
+          * ) echo "Please answer yes or no.";;
+      esac
+    done
+  fi
+
+  if [[ -n "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+    fn-require-bin "aws"
+    fn-require-bin "curl"
+    if [[ -z "$DOKKU_PLUGIN_S3_BUCKET" ]]; then
+      log-fail "No DOKKU_PLUGIN_S3_BUCKET environment variable set"
+    fi
+    if [[ -z "$DOKKU_PLUGIN_S3_PATH" ]]; then
+      log-fail "No DOKKU_PLUGIN_S3_PATH environment variable set"
+    fi
+  fi
+
+  if [[ ! -f plugin.toml ]]; then
+    log-error "No plugin.toml found"
+    return 1
+  fi
+
+  if [[ ! -d .git ]]; then
+    log-error "No git repository found"
+    return 1
+  fi
+
+  CURRENT_VERSION=$(grep version plugin.toml | cut -d '"' -f2)
+  major=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[1]}')
+  minor=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[2]}')
+  patch=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[3]}')
+
+  if [[ "$RELEASE" == "major" ]]; then
+    major=$((major + 1));
+    minor="0"
+    patch="0"
+  elif [[ "$RELEASE" == "minor" ]]; then
+    minor=$((minor + 1));
+    patch="0"
+  elif [[ "$RELEASE" == "patch" ]]; then
+    patch=$((patch + 1));
+  else
+    log-error "Invalid release type specified"
+    return 1
+  fi
+  NEXT_VERSION="${major}.${minor}.${patch}"  
+
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" plugin.toml
+  git add plugin.toml
+  git commit -m "Release ${NEXT_VERSION}"
+  git tag "${NEXT_VERSION}"
+  git push --tags origin master
+  git fetch
+
+  ORG_REPO_NAME="$(git remote -v | grep origin | HEAD -n1 | cut -d':' -f2 | cut -d'.' -f1)"
+  REPO_NAME="$(echo "$ORG_REPO_NAME" | cut -d'/' -f2)"
+  FILENAME="${REPO_NAME}-${NEXT_VERSION}.tar.gz"
+
+  if [[ -n "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+    DOKKU_PLUGIN_S3_BUCKET="${DOKKU_PLUGIN_S3_BUCKET%/}"
+    DOKKU_PLUGIN_S3_PATH="${DOKKU_PLUGIN_S3_PATH%/}"
+    if [[ "$DOKKU_PLUGIN_S3_PATH" != "/" ]]; then
+      DOKKU_PLUGIN_S3_PATH="${DOKKU_PLUGIN_S3_PATH}/"
+    fi
+
+    fn-github-download-release "$ORG_REPO_NAME" "$NEXT_VERSION" > "${TMP_WORK_DIR}/${FILENAME}"
+    aws s3 cp "${TMP_WORK_DIR}/${FILENAME}" "s3://${DOKKU_PLUGIN_S3_BUCKET}/${DOKKU_PLUGIN_S3_PATH}${FILENAME}" --acl public-read
+  fi
+}
+
+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,13 +1,19 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.13
+HEROKUISH_VERSION ?= 0.4.0
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
-DOKKU_DESCRIPTION = 'Docker powered mini-Heroku in around 100 lines of Bash'
+DOKKU_DESCRIPTION = 'Docker powered PaaS that helps you build and manage the lifecycle of applications'
 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.
@@ -15,7 +21,7 @@ You can use any language you want, so long as the script is
 executable and has the proper language requirements installed
 endef
 PLUGN_REPO_NAME ?= dokku/plugn
-PLUGN_VERSION ?= 0.2.1
+PLUGN_VERSION ?= 0.3.0
 PLUGN_ARCHITECTURE = amd64
 PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb
 PLUGN_URL = https://github.com/dokku/plugn/releases/download/v$(PLUGN_VERSION)/plugn_$(PLUGN_VERSION)_linux_x86_64.tgz
@@ -26,7 +32,7 @@ Simplifies running a single command over SSH, and
 manages authorized keys (ACL) and users in order to do so.
 endef
 SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
-SSHCOMMAND_VERSION ?= 0.4.0
+SSHCOMMAND_VERSION ?= 0.7.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
 SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand
@@ -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"
 
@@ -86,24 +92,24 @@ deb-herokuish:
 	@echo "-> Creating deb files"
 	@echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install
 	@echo "sleep 5" >> /tmp/tmp/post-install
-	@echo "count=\`sudo docker images | grep gliderlabs/herokuish | wc -l\`" >> /tmp/tmp/post-install
-	@echo 'if [ "$$count" -ne 0 ]; then' >> /tmp/tmp/post-install
-	@echo "  echo 'Removing old herokuish image'" >> /tmp/tmp/post-install
-	@echo "  sudo docker rmi gliderlabs/herokuish" >> /tmp/tmp/post-install
-	@echo "fi" >> /tmp/tmp/post-install
 	@echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	@echo "sudo docker build -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" /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)' --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:
@@ -121,24 +127,51 @@ deb-dokku:
 	cp dokku /tmp/build/usr/bin
 	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
 	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
 	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
+	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
 	$(MAKE) help2man
 	$(MAKE) addman
 	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
 	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
 	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
+ifeq ($(DOKKU_VERSION),master)
 	git describe --tags > /tmp/build/var/lib/dokku/VERSION
+else
+	echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
+endif
 	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
 ifneq (,$(findstring false,$(IS_RELEASE)))
 	sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
 endif
-	rm /tmp/build/DEBIAN/lintian-overrides
-	mv debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
+	rm -f /tmp/build/DEBIAN/lintian-overrides
+	cp debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
+ifdef DOKKU_GIT_REV
+	echo "$(DOKKU_GIT_REV)" > /tmp/build/var/lib/dokku/GIT_REV
+else
 	git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
-	sed -i "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control
-	dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
-	lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
+endif
+	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control && rm /tmp/build/DEBIAN/control.bak
+	dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+
+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)

debian/control

@@ -1,11 +1,11 @@
 Package: dokku
-Version: 0.6.4
+Version: 0.12.2
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, sshcommand, gliderlabs-sigil, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1), software-properties-common, python-software-properties
-Recommends: herokuish
-Pre-Depends: nginx, dnsutils, cgroupfs-mount | cgroup-lite, plugn, sudo, python2.7, debconf
+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
  Dokku is an extensible, open source Platform as a Service

debian/lintian-overrides

@@ -1,3 +1,12 @@
 dokku: command-with-path-in-maintainer-script postinst:16 /usr/bin/sshcommand
 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}"
 
@@ -35,7 +40,7 @@ case "$1" in
 
     echo "Setting up storage directories"
     mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/data
+    chown dokku:dokku ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
 
     echo "Setting up plugin directories"
     # should be replaced by `plugn init`
@@ -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

@@ -11,19 +11,21 @@ readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
 readonly DOKKU_LOGS_DIR="${DOKKU_LOGS_DIR:="/var/log/dokku"}"
 
 main() {
-  if [[ -f /etc/systemd/system/dokku-installer.conf ]] || [[ -f /etc/init/dokku-installer.conf ]]; then
+  if [[ -f /etc/systemd/system/dokku-installer.service ]] || [[ -f /etc/init/dokku-installer.conf ]]; then
     service dokku-installer stop || true
   fi
 
   rm -f /etc/init/dokku-installer.conf
   rm -f /etc/init/dokku-redeploy.conf
-  rm -f /etc/systemd/system/dokku-installer.conf
+  rm -f /etc/systemd/system/dokku-installer.service
   rm -f /etc/systemd/system/dokku-redeploy.service
   rm -f /etc/update-motd.d/99-dokku
 
   (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/backup-recovery.md

@@ -0,0 +1,40 @@
+# Backup and Recovery
+
+> The backup plugin was deprecated in 0.4.x, below are backup recommendations for 0.5.x and later.
+
+## Backup and Migration Tutorial
+
+Because Dokku is git based, rebuilding a deployed app is as easy as pushing from git. You can push to a new server by updating the `dokku` remote in you local app's repo.
+
+```shell
+git remote rm dokku
+git remote add dokku dokku@[dokku.me:dokku.me]
+git push dokku [master]
+```
+## Databases
+
+Some plugins, like the official [dokku-postgres](https://github.com/dokku/dokku-postgres) plugin, have built-in commands that allow non-volatile data be exported and imported.
+
+For [dokku-postgres](https://github.com/dokku/dokku-postgres), use:
+
+```shell
+dokku postgres:export [db_name] > [db_name].dump
+dokku postgres:import [db_name] < [db_name].dump
+```
+
+## Volumes and Static Assets
+
+Dokku doesn't enforce a [300mb](https://devcenter.heroku.com/articles/slug-compiler#slug-size) limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The Dokku storage core plugin can be used to mount local directories / volumes inside the docker container.
+
+See the [persistent storage documentation](/docs/advanced-usage/persistent-storage.md) for more details.
+
+
+## Disaster Recovery
+
+The best plan for disaster recovery is to always keep multiple (remote) copies of your local repo, static assets and periodic database dumps. In case of an emergency when your git repo and backups are completely lost, you can recover the last pushed copy from your remote Dokku server (assuming you still have the ssh key).
+
+```shell
+mkdir [app-name] ; cd !$
+git init && git remote add dokku dokku@[dokku.me:app-name]
+git pull dokku/master && git checkout dokku/master
+```

docs/advanced-usage/deployment-tasks.md

@@ -0,0 +1,34 @@
+# Deployment Tasks
+
+> New as of 0.5.0
+
+Sometimes you need to run a command on at deployment time, but before an app is completely deployed.
+Common use cases include:
+
+* Checking a database is initialized
+* Running database migrations
+* Any commands required to set up the server (e.g. something like a Django `collectstatic`)
+
+## `app.json` and `scripts.dokku`
+
+Dokku accomplishes this by using an `app.json` file. The format in use is similar to format of Heroku's [app.json](https://devcenter.heroku.com/articles/app-json-schema).
+However, Dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
+For buildpack apps, simply place an `app.json` file in the root of your repository.
+For dockerfile apps, place `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`.
+
+> NOTE: postdeploy changes are *NOT* committed to the app image.
+
+### Example app.json
+
+> NOTE: Only the `scripts.dokku.predeploy` and `scripts.dokku.postdeploy` tasks are supported by Dokku at this time. All other fields will be ignored and can be omitted.
+
+```json
+{
+  "scripts": {
+    "dokku": {
+      "predeploy": "touch /app/predeploy.test",
+      "postdeploy": "curl https://some.external.api.service.com/deployment?state=success"
+    }
+  }
+}
+```

docs/advanced-usage/docker-options.md

@@ -0,0 +1,112 @@
+# Docker Container Options
+
+> New as of 0.3.17
+
+Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
+
+```
+docker-options:add <app> <phase(s)> OPTION    # Add Docker option to app for phase (comma-separated phase list)
+docker-options:remove <app> <phase(s)> OPTION # Remove Docker option from app for phase (comma-separated phase list)
+docker-options:report [<app>] [<flag>]        # Displays a docker options report for one or more apps
+```
+
+> When specifying multiple phases, they **must** be comma-separated _without_ spaces in between each phase, like so:
+>
+> ```shell
+> dokku docker-options:add node-js-app deploy,run "-v /var/log/node-js-app:/app/logs"
+> ```
+
+## About Dokku phases
+
+Dokku deploys your application in multiple "phases" and the `docker-options` plugin allows you to pass arguments to their underlying docker container:
+
+- `build`: the container that executes the appropriate buildpack
+- `deploy`: the container that executes your running/deployed application
+- `run`: the container that executes any arbitrary command via `dokku run`
+
+## Examples
+
+### Add Docker options
+
+Add some options for the deployed/running app and when executing [`dokku run`](/docs/deployment/one-off-processes.md):
+
+```shell
+# Mount a host volume in a Docker container: "-v /host/path:/container/path"
+dokku docker-options:add node-js-app deploy "-v /var/log/node-js-app:/app/logs"
+dokku docker-options:add node-js-app run "-v /var/log/node-js-app:/app/logs"
+```
+
+> Note: When [mounting a host directory](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) in a Dokku app you should first create that directory as user `dokku` and then mount the directory under `/app` in the container using `docker-options` as above. Otherwise the app will lack write permission in the directory.
+
+### Remove a Docker option
+
+```shell
+dokku docker-options:remove node-js-app run "-v /var/log/node-js-app:/app/logs"
+```
+
+### Displaying docker-options reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the app's docker-options status using the `docker-options:report` command:
+
+```shell
+dokku docker-options:report
+```
+
+```
+=====> node-js-app docker options information
+       Docker options build:
+       Docker options deploy: -v /var/log/node-js-app:/app/logs
+       Docker options run:  -v /var/log/node-js-app:/app/logs
+=====> python-sample docker options information
+       Docker options build:
+       Docker options deploy:
+       Docker options run:
+=====> ruby-sample docker options information
+       Docker options build:
+       Docker options deploy:
+       Docker options run:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku docker-options:report node-js-app
+```
+
+```
+=====> node-js-app docker options information
+       Storage build mounts:
+       Storage deploy mounts: -v /var/log/node-js-app:/app/logs
+       Storage run mounts:  -v /var/log/node-js-app:/app/logs
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku docker-options:report node-js-app --docker-options-build
+```
+
+
+## Advanced usage
+
+In your applications folder `/home/dokku/app_name` create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).
+
+Inside this file list one Docker option per line. For example:
+
+```shell
+--link container_name:alias
+-v /host/path:/container/path
+-v /another/container/path
+```
+
+The above example will result in the following options being passed to Docker during `dokku run`:
+
+```shell
+--link container_name:alias -v /host/path:/container/path -v /another/container/path
+```
+
+You may also include comments (lines beginning with a #) and blank lines in the DOCKER_OPTIONS file.
+
+More information on Docker options can be found here: https://docs.docker.com/engine/reference/commandline/run/.

docs/advanced-usage/event-logs.md

@@ -5,22 +5,29 @@
 Docker provides an _events_ command to show system's real time events. Likewise, Dokku can record events as syslog entries and also provides a plugin to display the last ones.
 
 ```
-events [-t]                                      Show the last events (-t follows)
-events:list                                      List logged events
-events:on                                        Enable events logger
-events:off                                       Disable events logger
+events [-t]                              # Show the last events (-t follows)
+events:list                              # List logged events
+events:on                                # Enable events logger
+events:off                               # Disable events logger
 ```
 
 ## Usage
 
 Enable the plugin:
 
+```shell
+dokku events:on
+```
+
 ```
-$ dokku events:on
 Enabling dokku events logger
 ```
 
-Dokku will then write log entries to ``/var/log/syslog`` as well as a Dokku-specific logs sub-directory ``/var/log/dokku/events.log``, which can be easily displayed with the command `dokku events`:
+Dokku will then write log entries to `/var/log/syslog` as well as a Dokku-specific logs sub-directory `/var/log/dokku/events.log`, which can be easily displayed with the command `dokku events`:
+
+```shell
+dokku events
+```
 
 ```
 Jul  3 16:09:48 dokku.me dokku[127630]: INVOKED: pre-release-buildpack( pythonapp )
@@ -29,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 )
@@ -42,31 +47,35 @@ Jul  3 16:30:02 dokku.me dokku[131384]: INVOKED: docker-args-run( rubyapp )
 ```
 
 You can list all events that are currently being recorded via `dokku events:list`:
+
+```shell
+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

@@ -0,0 +1,150 @@
+# Persistent Storage
+
+> New as of 0.5.0
+
+The preferred method to mount external containers to a Dokku managed container, is to use the Dokku storage plugin.
+
+
+```
+storage:list <app>                             # List bind mounts for app's container(s) (host:container)
+storage:mount <app> <host-dir:container-dir>   # Create a new bind mount
+storage:report [<app>] [<flag>]                # Displays a checks report for one or more apps
+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.
+
+The storage plugin supports the following mount points:
+
+- 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
+
+This example demonstrates how to mount the recommended directory to `/storage` inside an application called `node-js-app`:
+
+```shell
+# we use a subdirectory inside of the host directory to scope it to just the app
+dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/storage
+```
+
+Dokku will then mount the shared contents of `/var/lib/dokku/data/storage` to `/storage` inside the container.
+
+Once you have mounted persistent storage, you will also need to restart the application. See the 
+[process scaling documentation](/docs/deployment/process-management.md) for more information.
+
+```shell
+dokku ps:rebuild app-name
+```
+
+A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container.
+
+```shell
+# creating storage for the app 'node-js-app'
+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 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
+dokku storage:mount app-name /var/lib/dokku/data/storage/node-js-app:/app/storage
+```
+
+You can mount one or more directories as desired by following the above pattern.
+
+### Displaying storage reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the app's storage status using the `storage:report` command:
+
+```shell
+dokku storage:report
+```
+
+```
+=====> node-js-app storage information
+       Storage build mounts:
+       Storage deploy mounts: -v /var/lib/dokku/data/storage/node-js-app:/app/storage
+       Storage run mounts:  -v /var/lib/dokku/data/storage/node-js-app:/app/storage
+=====> python-sample storage information
+       Storage build mounts:
+       Storage deploy mounts:
+       Storage run mounts:
+=====> ruby-sample storage information
+       Storage build mounts:
+       Storage deploy mounts:
+       Storage run mounts:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku storage:report node-js-app
+```
+
+```
+=====> node-js-app storage information
+       Storage build mounts:
+       Storage deploy mounts: -v /var/lib/dokku/data/storage/node-js-app:/app/storage
+       Storage run mounts:  -v /var/lib/dokku/data/storage/node-js-app:/app/storage
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku storage:report node-js-app --storage-deploy-mounts
+```
+
+## Use Cases
+
+### Persistent storage
+
+Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web applications, like user uploads or large binary assets like images, a directory outside the container should be mounted.
+
+### Shared storage between containers
+
+When scaling your app, you may require a common location to access shared assets between containers, a storage mount can be used in this situation.
+
+### Shared storage across environments
+
+Your app may be used in a cluster that requires containers or resources not running on the same host access your data. Mounting a shared file service (like S3FS or EFS) inside your container will give you great flexibility.
+
+### Backing up
+
+Your app may have services that are running in memory and need to be backed up locally (like a key store). Mount a non ephemeral storage mount will allow backups that are not lost when the app is shut down.
+
+### Build phase
+
+By default, Dokku will only bind storage mounts during the deploy and run phases. Under certain conditions, one might want to bind a storage mount during the build phase. This can be accomplished by using the `docker-options` plugin directly.
+
+```shell
+dokku docker-options:add <app> build "-v /tmp/python-test:/opt/test"
+```
+
+You cannot use mounted volumes during the build phase of a Dockerfile deploy. This is because Docker does not support volumes when executing `docker build`.
+
+> Note: **This can cause data loss** if you bind a mount under `/app` in buildpack apps as herokuish will attempt to remove the original app path during the build phase.
+
+## Application User and Persistent Storage file ownership (buildpack apps only)
+
+> New as of 0.7.1
+
+By default, Dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
+
+> NOTE: this user must exist in your herokuish image.
+
+Additionally, Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`.

docs/advanced-usage/plugin-management.md

@@ -0,0 +1,114 @@
+# Plugin Management
+
+> New as of 0.4.0
+
+```
+plugin:disable <name>                    # Disable an installed plugin (third-party only)
+plugin:enable <name>                     # Enable a previously disabled plugin
+plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]]           # Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
+plugin:install-dependencies [--core]     # Run install-dependencies trigger for active plugins (or only core ones)
+plugin:list                              # Print active plugins
+plugin:uninstall <name>                  # Uninstall a plugin (third-party only)
+plugin:update [name [committish]]        # Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
+```
+
+```shell
+# for 0.3.x
+cd /var/lib/dokku/plugins
+git clone <git url>
+dokku plugins-install
+```
+
+> These commands require `root` permissions as the `install` and `install-dependencies` plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please inspect those plugins before running the following command as `root` user.
+
+## Usage
+
+You can list all installed plugins using the `plugin` command:
+
+```shell
+dokku plugin
+```
+
+```
+plugn: dev
+  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.
+
+```shell
+dokku plugin:install https://github.com/dokku/dokku-postgres.git
+```
+
+```
+-----> Cloning plugin repo https://github.com/dokku/dokku-postgres.git to /var/lib/dokku/plugins/available/postgres
+Cloning into 'postgres'...
+remote: Counting objects: 646, done.
+remote: Total 646 (delta 0), reused 0 (delta 0), pack-reused 646
+Receiving objects: 100% (646/646), 134.24 KiB | 0 bytes/s, done.
+Resolving deltas: 100% (406/406), done.
+Checking connectivity... done.
+-----> Plugin postgres enabled
+```
+
+You can also uninstall a third-party plugin using the `plugin:uninstall` command:
+
+```shell
+dokku plugin:uninstall postgres
+```
+
+```
+-----> Plugin postgres uninstalled
+```
+
+Enabling or disabling a plugin can also be useful in cases where you are debugging whether a third-party plugin is causing issues in your Dokku installation:
+
+```shell
+dokku plugin:disable postgres
+```
+
+```
+-----> Plugin postgres disabled
+```
+
+```shell
+dokku plugin:enable postgres
+```
+
+```
+-----> Plugin postgres enabled
+```
+
+Finally, you can update an installed third-party plugin. This should be done after any upgrades of Dokku as there may be changes in the internal api that require an update of how the plugin interfaces with Dokku.
+
+```shell
+dokku plugin:update postgres
+```
+
+```
+Plugin (postgres) updated
+```

docs/advanced-usage/repository-management.md

@@ -0,0 +1,36 @@
+# Repository Management
+
+> New as of 0.6.0
+
+```
+repo:gc <app>                            # Runs 'git gc --aggressive' against the application's repo
+repo:purge-cache <app>                   # Deletes the contents of the build cache stored in the repository
+```
+
+The repository plugin is meant to allow users to perform management commands against a repository.
+
+## Usage
+
+### Git Garbage Collection
+
+This will run a git gc --aggressive against the applications repo. This is performed on the Dokku host, and not within an application container.
+
+```shell
+dokku repo:gc node-js-app
+```
+
+```
+Counting objects: 396, done.
+Delta compression using up to 2 threads.
+Compressing objects: 100% (365/365), done.
+Writing objects: 100% (396/396), done.
+Total 396 (delta 79), reused 315 (delta 0)
+```
+
+### Clearing Application cache
+
+Building containers with buildpacks currently results in a persistent `cache` directory between deploys. If you need to clear this cache directory for any reason, you may do so by running the following shell command:
+
+```shell
+dokku repo:purge-cache node-js-app
+```

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

@@ -1,17 +1,17 @@
 # 0.5.0 Migration Guide
 
-## nginx-vhosts
+## `nginx-vhosts` plugin
 
 - The nginx-vhosts template language is now [sigil](https://github.com/gliderlabs/sigil)
   - No need to escape literal `$` characters (or other "bash-isms")
   - Template variables are represented as {{ .VARIABLE_NAME }}
-  - A detailed list of template variables can be found [here](/dokku/nginx#available-template-variables)
+  - 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
-  - Check out an example template [here](/dokku/nginx/)
+  - 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`
@@ -20,6 +20,6 @@
 
 ## Dockerfile apps with exposed ports
 
-- Dockerfiles with `EXPOSE` clauses will get [all **tcp** ports proxied by default](/dokku/deployment/dockerfiles/#exposed-ports)
+- 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](/dokku/proxy/) 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.6.0-migration-guide.md

@@ -1,32 +1,32 @@
 # 0.6.0 Migration Guide
 
-## zero-downtime deployment
+## Zero-downtime deployment
 
 - You can now **actually** disable zero-downtime deployments per-app and per-process-type
   - Some config variables have been moved around
     - `DOKKU_CHECKS_ENABLED` has been migrated to `DOKKU_CHECKS_SKIPPED`
     - `DOKKU_CHECKS_DISABLED` is now a thing
     - The values for the above can be a comma-separated list of process-types or the literal string `_all_`
-  - See the [updated `checks`](/dokku/checks-examples/) docs for more info
+  - See the [updated `checks`](/docs/deployment/zero-downtime-deploys.md) docs for more info
 
-## proxy port mapping
+## Proxy port mapping
 
 - You can now configure host -> container proxy port mappings
-  - The UI is handled by the [proxy](/dokku/proxy/) interface plugin by setting the `DOKKU_PROXY_PORT_MAP` config variable in the format of `scheme:host-port:container-port`. The default `nginx-vhosts` proxy plugin supports both the `http` and `https` schemes.
+  - The UI is handled by the [proxy](/docs/advanced-usage/proxy-management.md) interface plugin by setting the `DOKKU_PROXY_PORT_MAP` config variable in the format of `scheme:host-port:container-port`. The default `nginx-vhosts` proxy plugin supports both the `http` and `https` schemes.
 - Default port mappings
   - buildpack apps will be set to `http:80:5000` and will also include `https:443:5000` if SSL is enabled.
   - dockerfile apps with explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on each exposed port that proxies to the same port of the deployed application container.
-    - You may override this behavior with the [`proxy:ports-*` commands](/dokku/proxy/) or by directly setting `DOKKU_PROXY_PORT_MAP` with the `config:set` command
+    - You may override this behavior with the [`proxy:ports-*` commands](/docs/advanced-usage/proxy-management.md) or by directly setting `DOKKU_PROXY_PORT_MAP` with the `config:set` command
     - dockerfile apps without explicitly exposed ports will behave the same as a buildpack app
   - NOTE: These defaults **are not** automatically changed on subsequent pushes and must be manipulated with the aforementioned commands
 
-## calling the dokku binary
+## Calling the `dokku` binary
 
-- Plugins should *not* call the dokku binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call dokku internal functions. As a result, the following dokku commands are no longer publicly exposed:
- - dokku build
- - dokku receive
- - dokku release
- - dokku tar:build
- - dokku tar:build-locked
- - dokku git:build
- - dokku git:build-locked
+- Plugins should *not* call the `dokku` binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions. As a result, the following Dokku commands are no longer publicly exposed:
+ - `dokku build`
+ - `dokku receive`
+ - `dokku release`
+ - `dokku tar:build`
+ - `dokku tar:build-locked`
+ - `dokku git:build`
+ - `dokku git:build-locked`

docs/appendices/0.7.0-migration-guide.md

@@ -0,0 +1,13 @@
+# 0.7.0 Migration Guide
+
+## Persistent Storage
+
+We should now properly handle file ownership for mounted directories. This was enhanced in 0.7.1. See the [persistent storage documentation](/docs/advanced-usage/persistent-storage.md) for more details.
+
+## Restart Policies
+
+If you previously managed container restart policies via docker-options, these can now be managed natively via the built-in `ps` plugin. There is no migration necessary. See the [restart policy documentation](/docs/deployment/process-management.md#restart-policies) for more details.
+
+## SSH Keys
+
+Dokku now has an `ssh-keys` plugin that can be used to manage ssh keys for the `dokku` user on the host operating system. See the [user management documentation](/docs/deployment/user-management.md) for more details.

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.6.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.6.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.6.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.6.4/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.6.4\/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.6.4\/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.6.4\/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.6.4\/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.6.4\/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.6.4\/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,7 +1,7 @@
 body {
-  font-family: 'Open Sans', sans-serif;
+  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;
-  font-size: 12px;
   padding-bottom: 40px;
   color: #5a5a5a;
   -webkit-font-smoothing: antialiased;
@@ -20,8 +20,8 @@ h1 {
 }
 .header .heading {
   color: #fff;
-  font-size: 23px;
-  margin: 0;
+  font-size: 2.4em;
+  margin: 7px 0 0 0;
   padding: 0 0 0 1em;
 }
 .header a {
@@ -35,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.6.4/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.6.4/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;
@@ -66,8 +75,8 @@ h1 {
   box-shadow: 0 3px 0 rgba(0, 0, 0, 0.5);
   color: #444;
   display: block;
+  font-size: 1.6em;
   font-weight: 400;
-  font-size: 14px;
   margin: 0 20px;
   padding: 3px 0;
   text-align: center;
@@ -105,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;
@@ -138,6 +148,7 @@ h1 {
 }
 .alternate-instructions {
   display: block;
+  font-size: 1.6em;
   line-height: 1.3em;
   margin: 45px auto;
   max-width: 750px;
@@ -168,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 {
@@ -200,7 +212,7 @@ h1 {
 }
 .team-members .fund-link {
   display: block;
-  font-size: 80%;
+  font-size: .8em;
 }
 .team-member {
   min-height: 320px;
@@ -211,6 +223,7 @@ h1 {
 
 .list-group-item {
   border: none;
+  font-size: 1.1em;
   font-weight: normal;
   padding: .2rem .5rem;
   color: #157577;
@@ -231,7 +244,7 @@ a.list-group-item {
   text-transform: uppercase;
 }
 .table-of-contents {
-  font-size: 0.8em;
+  font-size: 1.2em;
   padding: 1em;
   margin: 0 0 0.5em 0.5em;
 }
@@ -246,35 +259,35 @@ a.list-group-item {
   -webkit-font-smoothing: antialiased;
   box-sizing: border-box;
   color: rgb(71, 74, 84);
-  font-size: 14px;
+  font-size: 1.6em;
   font-weight: normal;
   height: 20px;
-  line-height: 20px;
+  line-height: 1.5;
   text-align: left;
 }
 .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;
@@ -282,12 +295,44 @@ a.list-group-item {
 .markdown-body h1 + h2 {
   margin-top: 1em;
 }
+.highlight-show-language {
+  position: relative;
+}
+.highlight-show-language-label {
+  color: black;
+  background-color: #CFCFCF;
+  display: inline-block;
+  position: absolute;
+  bottom: auto;
+  left: auto;
+  top: 0;
+  right: 0;
+  width: auto;
+  height: auto;
+  font-size: 1.2em;
+  border-radius: 0 0 0 5px;
+  padding: 0 0.5em;
+  text-shadow: none;
+  z-index: 1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  -webkit-transform: none;
+  -moz-transform: none;
+  -ms-transform: none;
+  -o-transform: none;
+  transform: none;
+}
+.highlight-output pre {
+  color: #fff;
+  background-color: #000;
+  padding: 10px;
+}
 code {
   padding: 0;
   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;
@@ -335,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
 }
@@ -348,6 +398,59 @@ blockquote {
 .clearfix:after {
   clear: both
 }
+.improve-slideout {
+  position: fixed;
+  bottom: 66%;
+  right: 0;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  -o-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  background: #363637;
+  padding: 5px 0 4px;
+  z-index: 90;
+}
+.improve-slideout:hover {
+  right: 205px;
+}
+.improve-slideout:hover .improve-slideout-inner {
+  right: 0;
+}
+.improve-slideout-inner {
+  position: fixed;
+  bottom: 66%;
+  right: -205px;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  -o-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  background: #e0e0d9;
+  padding: 4px 12px;
+  width: 205px;
+}
+.improve-slideout-inner h6 {
+  color: #363637;
+  font-weight: 700;
+  text-transform: uppercase;
+  margin: 0;
+  font-size: 1.3em;
+}
+.git-improve {
+  vertical-align: -2px;
+  padding-left: 8px;
+}
+.back-to-contents {
+  position: fixed;
+  bottom: calc(66% - 34px);
+  right: 0;
+  background: #363637;
+  padding: 5px 0 4px;
+  z-index: 90;
+}
+.icon-improve {
+  color: #bdbdb5;
+  padding: 2px 9px 0 10px;
+}
 a .fa {
   display: inline-block;
   text-decoration: inherit
@@ -497,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;
 }
@@ -514,18 +617,20 @@ ul.fas li .fa-large:before, ul.fas li .fa-large:before {
     height: auto
   }
 }
+
+.button.slack-button > img {
+    width: inherit;
+}
+
 @media (min-width: 768px) {
   .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

@@ -1,8 +1,14 @@
 {
   "max-versions": [
-    "0.3.26",
-    "0.4.14",
-    "0.5.8",
-    "0.6.4"
+    "0.3.26", 
+    "0.4.14", 
+    "0.5.8", 
+    "0.6.5", 
+    "0.7.2", 
+    "0.8.2", 
+    "0.9.4", 
+    "0.10.5", 
+    "0.11.6", 
+    "0.12.2"
   ]
 }

docs/backup-recovery.md

@@ -1,45 +0,0 @@
-# Backup and Recovery
-
-> The backup plugin was deprecated in 0.4.x, below are backup recommendations for 0.5.x and later.
-
-## Backup and Migration Tutorial
-
-Because Dokku is git based, rebuilding a deployed app is as easy as pushing from git. You can push to a new server by updating the dokku remote in you local app's repo.
-
-```
-$ git remote rm dokku
-$ git remote add dokku dokku@[dokku.me:dokku.me]
-$ git push dokku [master]
-```
-## Databases
-
-Some plugins, like the official [dokku-postgres] plugin, have built-in commands that allow non-volatile data be exported and imported. 
-
-For [dokku-postgres], use:
-```
-dokku postgres:export [db_name] > [db_name].dump
-dokku postgres:import [db_name] < [db_name].dump
-```
-
-## Volumes and Static Assets
-
-Dokku doesn't enforce a [300mb] limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The dokku storage core plugin can be used to mount local directories / volumes inside the docker container.
-
-```
-storage:list <app>, List bind mounts for app's container(s) (host:container)
-storage:mount <app> <host-dir:container-dir>, Create a new bind mount
-storage:unmount <app> <host-dir:container-dir>, Remove an existing bind mount
-```
-
-## Disaster Recovery
-
-The best plan for disaster recovery is to always keep multiple (remote) copies of your local repo, static assets and periodic database dumps. In case of an emergency when your git repo and backups are completely lost, you can recover the last pushed copy from your remote dokku server (assuming you still have the ssh key).
-
-```
-mkdir [app-name] ; cd !$
-git init && git remote add dokku dokku@[dokku.me:app-name]
-git pull dokku/master && git checkout dokku/master
-```
-
-[dokku-postgres]: <https://github.com/dokku/dokku-postgres>
-[300mb]: <https://devcenter.heroku.com/articles/slug-compiler#slug-size>

docs/community/clients.md

@@ -1,19 +1,19 @@
 # Clients
 
-Given the constraints, running dokku commands remotely via SSH is fine. For certain configurations, the extra complication of manually invoking ssh can be a burden.
+Given the constraints, running Dokku commands remotely via SSH is fine. For certain configurations, the extra complication of manually invoking ssh can be a burden.
 
-While dokku does not yet have an official client, there are a multitude of ways in which you can interact with your dokku installation. The easiest is to use the **bash** client, though you may wish to use another.
+While Dokku does not yet have an official client, there are a multitude of ways in which you can interact with your Dokku installation. The easiest is to use the **bash** client, though you may wish to use another.
 
 ## (bash, zsh, etc.) `dokku_client.sh`
 
-Of all methods, this is the *most* official method of interacting with your dokku installation. It is a bash script that interacts with a remote dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the dokku repository.
+Of all methods, this is the *most* official method of interacting with your Dokku installation. It is a bash script that interacts with a remote Dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the Dokku repository.
 
-To install, simply clone the dokku repository down and add the `dokku` alias pointing at the script:
+To install, simply clone the Dokku repository down and add the `dokku` alias pointing at the script:
 
 ```shell
 git clone git@github.com:dokku/dokku.git ~/.dokku
 
-# optional: make sure that the dokku_client.sh version matches your dokku version
+# optional: make sure that the dokku_client.sh version matches your Dokku version
 cd ~/.dokku
 git checkout <tag/branch>
 
@@ -35,13 +35,13 @@ alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 ```
 
-Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named dokku pointed at your dokku host in order to use the script as normal.
+Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named `dokku` pointed at your Dokku host in order to use the script as normal.
 
 You can also configure a `DOKKU_PORT` environment variable if you are running ssh on a non-standard port. This defaults to `22`.
 
 ## (nodejs) dokku-toolbelt
 
-Dokku-toolbelt is a node-based cli wrapper that proxies requests to the dokku command running on remote hosts. You can install it via the following shell command (assuming you have nodejs and npm installed):
+Dokku-toolbelt is a node-based cli wrapper that proxies requests to the Dokku command running on remote hosts. You can install it via the following shell command (assuming you have nodejs and npm installed):
 
 ```shell
 npm install -g dokku-toolbelt
@@ -51,7 +51,7 @@ See [documentation here](https://www.npmjs.com/package/dokku-toolbelt) for more
 
 ## (python) dokku-client
 
-dokku-client is an extensible python-based cli wrapper for remote dokku hosts.  You can install it via the following shell command (assuming you have python and pip installed):
+dokku-client is an extensible python-based cli wrapper for remote Dokku hosts.  You can install it via the following shell command (assuming you have python and pip installed):
 
 ```shell
 pip install dokku-client
@@ -61,7 +61,7 @@ See [documentation here](https://github.com/adamcharnock/dokku-client) for more
 
 ## (ruby) Dokku CLI
 
-Dokku CLI is a rubygem that acts as a client for your dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dokku CLI is a rubygem that acts as a client for your Dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
 
 ```shell
 gem install dokku-cli
@@ -71,7 +71,7 @@ See [documentation here](https://github.com/SebastianSzturo/dokku-cli) for more
 
 ## (ruby) DokkuClient
 
-DokkuClient is another rubygem that acts as a client for your dokku installation with built-in support for certain external plugins. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+DokkuClient is another rubygem that acts as a client for your Dokku installation with built-in support for certain external plugins. You can install it via the following shell command (assuming you have ruby and rubygems installed):
 
 ```shell
 gem install dokku_client
@@ -81,7 +81,7 @@ See [documentation here](https://github.com/netguru/dokku_client) for more infor
 
 ## (ruby) Dokkufy
 
-Dokkufy is a rubygem that handles automation of certain tasks, such as dokku setup, plugin installation, etc. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dokkufy is a rubygem that handles automation of certain tasks, such as Dokku setup, plugin installation, etc. You can install it via the following shell command (assuming you have ruby and rubygems installed):
 
 ```shell
 gem install dokkufy
@@ -91,7 +91,7 @@ See [documentation here](https://github.com/cbetta/dokkufy) for more information
 
 ## (ruby) Dockland
 
-Dockland is a rubygem that acts as a client for your dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dockland is a rubygem that acts as a client for your Dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
 
 ```shell
 gem install dockland

docs/community/plugins.md

@@ -2,40 +2,31 @@
 
 Dokku itself is built out of plugins and uses [plugn](https://github.com/dokku/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
 
-Let's take a quick look at the current dokku nginx plugin that's shipped with dokku by default.
+Let's take a quick look at the current Dokku nginx plugin that's shipped with Dokku by default.
 
     nginx-vhosts/
     ├── plugin.toml  # plugin metadata
     ├── commands     # contains additional commands
-    ├── install      # runs on dokku installation
+    ├── install      # runs on Dokku installation
     └── post-deploy  # runs after an app is deployed
 
 ## Installing a plugin
 
-```shell
-# This command requires `root` permissions as the `install` and `install-dependencies`
-# plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please
-# inspect those plugins before running the following command as `root` user.
-sudo dokku plugin:install <git_url> [--committish tag/branch/commit|--name custom-plugin-name]
-
-# previous versions (0.3.x and below) of dokku require a manual process to install plugins
-cd /var/lib/dokku/plugins
-git clone <git url>
-dokku plugins-install
-```
+[See the plugin management documentation](/docs/advanced-usage/plugin-management.md).
 
 ## Creating your own plugin
 
-[See the full documentation](/dokku/development/plugin-creation).
+[See the full documentation](/docs/development/plugin-creation.md).
 
 ## Official Plugins (Beta)
 
-The following plugins are available and provided by dokku maintainers. Where noted, these plugins should be considered beta software and may not have been used as thoroughly as community plugins. Please file issues against their respective issue trackers.
+The following plugins are available and provided by Dokku maintainers. Where noted, these plugins should be considered beta software and may not have been used as thoroughly as community plugins. Please file issues against their respective issue trackers.
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [CouchDB (beta)](https://github.com/dokku/dokku-couchdb)                                          | [dokku][]             | 0.4.0+                |
 | [Elasticsearch (beta)](https://github.com/dokku/dokku-elasticsearch-plugin)                       | [dokku][]             | 0.4.0+                |
+| [Grafana/Graphite/Statsd (beta)](https://github.com/dokku/dokku-graphite-grafana)                 | [dokku][]             | 0.4.0+                |
 | [MariaDB (beta)](https://github.com/dokku/dokku-mariadb-plugin)                                   | [dokku][]             | 0.4.0+                |
 | [Memcached (beta)](https://github.com/dokku/dokku-memcached-plugin)                               | [dokku][]             | 0.4.0+                |
 | [Mongo (beta)](https://github.com/dokku/dokku-mongo-plugin)                                       | [dokku][]             | 0.4.0+                |
@@ -53,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
@@ -66,44 +57,54 @@ Note: The following plugins have been supplied by our community and may not have
 [Aluxian]: https://github.com/Aluxian
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
-[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [basgys]: https://github.com/basgys
+[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [blag]: https://github.com/blag
 [cameron-martin]: https://github.com/cameron-martin
+[candlewaster]: https://notabug.org/candlewaster
 [cedricziel]: https://github.com/cedricziel
 [cef]: https://github.com/cef
 [cjblomqvist]: https://github.com/cjblomqvist
 [crisward]: https://github.com/crisward
+[cu12]: https://github.com/cu12
 [darkpixel]: https://github.com/darkpixel
 [dokku]: https://github.com/dokku
+[dokku-community]: https://github.com/dokku-community
 [dyson]: https://github.com/dyson
 [F4-Group]: https://github.com/F4-Group
 [fermuch]: https://github.com/fermuch
 [fgrehm]: https://github.com/fgrehm
 [Flink]: https://github.com/Flink
 [gdi2290]: https://github.com/gdi2290
-[heichblatt]: https://github.com/heichblatt
 [hughfletcher]: https://github.com/hughfletcher
 [iamale]: https://github.com/iamale
 [ignlg]: https://github.com/ignlg
+[iloveitaly]: https://github.com/iloveitaly
+[investtools]: https://github.com/investtools
 [iskandar]: https://github.com/iskandar
 [jagandecapri]: https://github.com/jagandecapri
 [jeffutter]: https://github.com/jeffutter
 [jlachowski]: https://github.com/jlachowski
+[josegonzalez]: https://github.com/josegonzalez
 [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
 [mbriskar]: https://github.com/mbriskar
 [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
 [nickstenning]: https://github.com/nickstenning
 [nornagon]: https://github.com/nornagon
 [ohardy]: https://github.com/ohardy
@@ -123,6 +124,8 @@ Note: The following plugins have been supplied by our community and may not have
 [thrashr888]: https://github.com/thrashr888
 [wmluke]: https://github.com/wmluke
 [Zenedith]: https://github.com/Zenedith
+[fteychene]: https://github.com/fteychene
+[sarendsen]: https://github.com/sarendsen
 
 ### Datastores
 
@@ -130,20 +133,19 @@ Note: The following plugins have been supplied by our community and may not have
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                  |
-| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                  |
-| [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+                |
-| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]         | 0.3.x                  |
-| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                  |
-| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+                |
+| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                 |
+| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                 |
+| [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+               |
+| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]        | 0.3.x                 |
+| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                 |
+| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+               |
 
 #### Caching
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Nginx Cache](https://github.com/Aluxian/dokku-nginx-cache)                                       | [Aluxian][]           | 0.5.0+                |
-| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | 0.3.26+                |
-| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                  |
+| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                 |
 | [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [Zenedith][]          | Varnish cache between nginx and application with base configuration|
 
 #### Queuing
@@ -153,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
 
@@ -164,48 +167,33 @@ Note: The following plugins have been supplied by our community and may not have
 | [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                 |
 
 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
-
-### Process Managers
-
-| Plugin                                                                                            | Author                | Compatibility         |
-| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Circus](https://github.com/apmorton/dokku-circus)                                                | [apmorton][]          |                       |
-| [Forego](https://github.com/iskandar/dokku-forego)                                                | [iskandar][]          | Compatible with 0.2.x |
-| [Forego](https://github.com/Flink/dokku-forego)                                                   | [Flink][]             | 0.4.0+                |
-| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | 0.4.0+                |
-| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
-| [Shoreman ](https://github.com/statianzo/dokku-shoreman)                                          | [statianzo][]         | 0.3.x                 |
-| [Supervisord](https://github.com/statianzo/dokku-supervisord)                                     | [statianzo][]         | 0.3.x                 |
-
 [c77cbf1]: https://github.com/dokku/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
 [28de3ec]: https://github.com/dokku/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40
 
-### Dokku Features
+### Plugins Implementing New Dokku Functionality
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [App name as env](https://github.com/cjblomqvist/dokku-app-name-env)                              | [cjblomqvist][]       | 0.3.x                 |
-| [App User](https://github.com/expa/dokku-app-user)                                                | [michaelshobbs][]     | 0.4.0+                |
+| [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+                |
-| [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
-| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
-| [Dokku Copy App Config Files](https://github.com/heichblatt/dokku-supply-config)                  | [heichblatt][]        |                       |
-| [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | dokku >= [c77cbf1][]  |
+| [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/cjblomqvist/dokku-git-rev)                         | [cjblomqvist][]       | 0.4.0+                |
-| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+               |
+| [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+                |
-| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
-| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
-| [Nuke Containers](https://github.com/heichblatt/dokku-nuke)                                       | [heichblatt][]        |                       |
-| [Open App Ports](https://github.com/heichblatt/dokku-ports)                                       | [heichblatt][]        |                       |
-| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | 0.4.0+                |
-| [Proctype Filter](https://github.com/expa/dokku-proctype-filter)                                  | [michaelshobbs][]     | 0.4.0+                |
-| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.3.x                 |
+| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
+| [Monit (Health Checks)](https://github.com/mbreit/dokku-monit)                                    | [mbreit][]            | 0.8.0+                |
+| [Nuke Containers](https://github.com/josegonzalez/dokku-nuke)                                     | [josegonzalez][]      | 0.4.0+                |
+| [Open App Ports](https://github.com/josegonzalez/dokku-ports)                                     | [josegonzalez][]      | 0.3.x                 |
+| [Proctype Filter](https://github.com/michaelshobbs/dokku-proctype-filter)                         | [michaelshobbs][]     | 0.4.0+                |
+| [robots.txt](https://notabug.org/candlewaster/dokku-robots.txt)                                   | [candlewaster][]      | 0.4.x                 |
+| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.4.0+                |
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>4</sup>                   | [cedricziel][]        | 0.3.x                 |
-| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | 0.3.x                 |
+| [Application build hook](https://github.com/fteychene/dokku-build-hook)                           | [fteychene][]         | 0.4.0+                 |
 
 [217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
 
@@ -222,57 +210,69 @@ Note: The following plugins have been supplied by our community and may not have
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             | 0.4.0+                |
-| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.2.0+ (tag 0.2.0), 0.3.0+ (tag 0.3.0), 0.4.0+ |
-| [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
-| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] |                       |
-| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        |                       |
-| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           |                       |
-| [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      |                       |
+| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.4.0+                |
+| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] | 0.3.x                 |
+| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        | 0.3.x                 |
+| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           | 0.3.x                 |
+| [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      | 0.3.x                 |
 | [Builders: bower, compass, gulp, grunt](https://github.com/ignlg/dokku-builders-plugin)           | [ignlg][]             | 0.4.0+                |
+| [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+                |
-| [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
-| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski]          | <0.4.0                |
-| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-grafana)                           | [jlachowski]          | 0.4.0+, graphite & statsd plugin with grafana dashboard frontend  |
-| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.3.26+               |
+| [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+                |
-| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
-| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
-| [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | 0.3.15+, Dockerfile support |
+| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            | 0.3.x                 |
+| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         | 0.3.x                 |
+| [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+                |
 | [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/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  | 0.4.0+                |
-| [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
-| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          |                       |
-| [Wordpress](https://github.com/dudagroup/dokku-wordpress-template)                                | [abossard][]          | Dokku dev, mariadb, volume, domains |
-| [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+ |
-| [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+ |
-| [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+ |
-
-<sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
+| [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                 |
+| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          | 0.4.0+                |
+| [Dokku Wordpress](https://github.com/dokku-community/dokku-wordpress)                             | [dokku-community][]      | 0.4.0+                |
+| [Access](https://github.com/mainto/dokku-access)                                                  | [mainto](https://github.com/mainto)            | 0.4.0+                |
 
 ### Deprecated Plugins
 
 The following plugins have been removed as their functionality is now in Dokku Core.
 
-| Plugin                                                                                            | Author                | In Dokku Since                  |
-| ------------------------------------------------------------------------------------------------- | --------------------- | ------------------------------- |
-| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)        |
-| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]        | v0.3.9 (trace command)          |
-| [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin) |
-| [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)         |
-| [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin) |
-| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]        | v0.3.14 (ps plugin              |
-| [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin) |
-| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)        |
-| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin) |
-| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)        |
-| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin) |
-| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)  |
-| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)             |
-| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)       |
-| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)       |
-| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)       |
-| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)        |
+| Plugin                                                                                            | Author                | In Dokku Since                            |
+| ------------------------------------------------------------------------------------------------- | --------------------- | ----------------------------------------- |
+| [App User](https://github.com/michaelshobbs/dokku-app-user)                                       | [michaelshobbs][]     | v0.7.1 (herokuish 0.3.18)                 |
+| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)                  |
+| [Debug](https://github.com/josegonzalez/dokku-debug)                                              | [josegonzalez][]      | v0.3.9 (trace command)                    |
+| [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)                       |
+| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           | v0.4.0 (herokuish)                        |
+| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)                  |
+| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin)          |
+| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)                  |
+| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin)           |
+| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | v0.5.0 (deployment tasks)                 |
+| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)            |
+| [Process Manager: Circus](https://github.com/apmorton/dokku-circus)                               | [apmorton][]          | v0.3.14/0.7.0 (ps/restart policy plugin)  |
+| [Process Manager: Forego](https://github.com/Flink/dokku-forego)                                  | [Flink][]             | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Forego](https://github.com/iskandar/dokku-forego)                               | [iskandar][]          | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)      | [sehrope][]           | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Shoreman ](https://github.com/statianzo/dokku-shoreman)                         | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Supervisord](https://github.com/statianzo/dokku-supervisord)                    | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
+| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)                       |
+| [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | Docker 1.8+                               |
+| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)                 |
+| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)                 |
+| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)                 |
+| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)                  |
+| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | v0.5.0 (storage plugin)                   |
 
 <sup>1</sup> Conflicts with [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)
 <sup>2</sup> Similar to the heroku-labs feature (see https://devcenter.heroku.com/articles/labs-user-env-compile)
@@ -287,10 +287,14 @@ The following plugins are no longer maintained by their developers.
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
+| [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
 | [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+                |
 | [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
+| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
 | [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              | Not compatible with >= 0.3.0 (still uses /home/git) |
 | [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
+| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        | < 0.4.0               |
+| [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
 | [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+                |
 | [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
 | [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
@@ -299,3 +303,6 @@ The following plugins are no longer maintained by their developers.
 | [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
 | [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
 | [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |
+| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | 0.3.26+               |
+
+<sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.

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

@@ -1,8 +0,0 @@
-# Components
-
- * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager
- * [Herokuish](https://github.com/gliderlabs/herokuish) - Buildpack builder
- * [plugn](https://github.com/dokku/plugn) - Shell based plugins and hooks
- * [sshcommand](https://github.com/dokku/sshcommand) - Fixed commands over SSH
-
-Looking to keep codebase as simple and hackable as possible, so try to keep your line count down.

docs/configuration-management.md

@@ -1,59 +0,0 @@
-# Environment Variables
-
-Typically an application will require some configuration to run properly. Dokku supports application configuration via environment variables. Environment variables may contain private data, such as passwords or API keys, so it is not recommended to store them in your application's repository.
-
-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
-```
-
-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).
-
-For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
-
-> Note: Global `ENV` files are sourced before app-specific `ENV` files. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.
-
-You can set multiple environment variables at once:
-
-```shell
-dokku config:set node-js-app ENV=prod COMPILE_ASSETS=1
-```
-
-When setting variables with whitespaces, you need to escape them:
-
-```shell
-dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
-```
-
-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:
-
-```shell
-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:
-
-```shell
-dokku config node-js-app --export
-# 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)
-```
-
-You can also output the variables in a single-line for usage in command-line utilities with the `--shell` flag:
-
-```shell
-dokku config node-js-app --shell
-
-# outputs variables in the form:
-#
-#   ENV='prod' COMPILE_ASSETS='1'
-```

docs/configuration/domains.md

@@ -0,0 +1,149 @@
+# Domain Configuration
+
+> New as of 0.3.10
+
+```
+domains:add <app> <domain> [<domain> ...]      # Add domains to app
+domains:add-global <domain> [<domain> ...]     # Add global domain names
+domains:clear <app>                            # Clear all domains for app
+domains:disable <app>                          # Disable VHOST support
+domains:enable <app>                           # Enable VHOST support
+domains:remove <app> <domain> [<domain> ...]   # Remove domains from app
+domains:remove-global <domain> [<domain> ...]  # Remove global domain names
+domains:report [<app>] [<flag>]                # Displays a domains report for one or more apps
+domains: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/networking/proxy-management.md) for information as to how to reconfigure the mappings.
+
+## Customizing hostnames
+
+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 dokku configuration. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
+
+If a FQDN such as `other.tld` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+
+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:
+
+```shell
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
+
+NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
+echo "$NEW_SUBDOMAIN.$VHOST"
+```
+
+If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed.
+
+## Disabling VHOSTS
+
+If desired, it is possible to disable vhosts with the domains plugin.
+
+```shell
+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_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 `node-js-app` is the name of your app
+
+# add a domain to an app
+dokku domains:add node-js-app dokku.me
+
+# list custom domains for app
+dokku domains node-js-app
+
+# clear all custom domains for app
+dokku domains:clear node-js-app
+
+# remove a custom domain from app
+dokku domains:remove node-js-app dokku.me
+
+# set all custom domains for app
+dokku domains:set node-js-app dokku.me dokku.org
+```
+
+## Displaying domains reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the app's domains status using the `domains:report` command:
+
+```shell
+dokku domains:report
+```
+
+```
+=====> node-js-app domains information
+       Domains app enabled: true
+       Domains app vhosts:  ruby-sample.dokku.org
+       Domains global enabled: true
+       Domains global vhosts: dokku.org
+=====> python-sample domains information
+       Domains app enabled: true
+       Domains app vhosts:  ruby-sample.dokku.org
+       Domains global enabled: true
+       Domains global vhosts: dokku.org
+=====> ruby-sample domains information
+       Domains app enabled: true
+       Domains app vhosts:  ruby-sample.dokku.org
+       Domains global enabled: true
+       Domains global vhosts: dokku.org
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku domains:report node-js-app
+```
+
+```
+=====> node-js-app domains information
+       Domains app enabled: true
+       Domains app vhosts:  node-js-app.dokku.org
+       Domains global enabled: true
+       Domains global vhosts: dokku.org
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku domains:report node-js-app --domains-app-enabled
+```
+
+## Default site
+
+By default, Dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to the global nginx configuration.
+
+Create the file at `/etc/nginx/conf.d/00-default-vhost.conf`:
+
+```nginx
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+
+  server_name _;
+  return 410;
+  log_not_found off;
+}
+```
+
+Make sure to reload nginx after creating this file by running `service nginx reload`.
+
+This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).
+
+The configuration file must be loaded before `/etc/nginx/conf.d/dokku.conf`, so it can not be arranged as a vhost in `/etc/nginx/sites-enabled` that is only processed afterwards.
+
+Alternatively, you may push an app to your Dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.

docs/configuration/environment-variables.md

@@ -0,0 +1,122 @@
+# Environment Variables
+
+Typically an application will require some configuration to run properly. Dokku supports application configuration via environment variables. Environment variables may contain private data, such as passwords or API keys, so it is not recommended to store them in your application's repository.
+
+The `config` plugin provides the following commands to manage your variables:
+
+```
+config (<app>|--global)                                     Display all global or app-specific config vars
+config:get (<app>|--global) KEY                             Display a global or app-specific config value
+config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]   Set one or more config vars
+config:unset (<app>|--global) KEY1 [KEY2 ...]               Unset one or more config vars
+config:export [--format=FORMAT] [--merged] (<app>|--global) Export all global or app-specific configuration
+```
+
+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).
+
+For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
+
+> Note: Global `ENV` files are sourced before app-specific `ENV` files. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.
+
+You can set multiple environment variables at once:
+
+```shell
+dokku config:set node-js-app ENV=prod COMPILE_ASSETS=1
+```
+
+> 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 --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:
+
+```shell
+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 `config:export` command
+
+```shell
+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:export node-js-app)
+```
+
+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:export --format shell node-js-app
+
+# outputs variables in the form:
+#
+#   ENV='prod' COMPILE_ASSETS='1'
+```
+
+## Special Config Variables
+
+The following list config variables have special meaning and can be set in a variety of ways.
+
+> Warning: This list is not exhaustive, and may vary from version to version.
+
+| Name                           | Default                         | How to modify                                                                                                                                    | Description                                                                                                |
+| ------------------------------ | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------- |
+| `DOKKU_ROOT`                   | `~dokku`                        | `/etc/environment`                                                                                                                               | The root directory where dokku will store application repositories, as well as certain configuration files. |
+| `DOKKU_IMAGE`                  | `gliderlabs/herokuish`          | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The default image to use when building herokuish containers. |
+| `DOKKU_LIB_ROOT`               | `/var/lib/dokku`                | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory where plugins, certain data, and general configuration is stored. |
+| `PLUGIN_PATH`                  | `$DOKKU_LIB_ROOT/plugins"`      | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The top-level directory where plugins are stored. |
+| `PLUGIN_AVAILABLE_PATH`        | `$PLUGIN_PATH/available"`       | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory that holds all available plugins, including core. |
+| `PLUGIN_ENABLED_PATH`          | `$PLUGIN_PATH/enabled"`         | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory that holds all enabled plugins, including core. |
+| `PLUGIN_CORE_PATH`             | `$DOKKU_LIB_ROOT/core-plugins"` | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory that stores all core plugins. |
+| `PLUGIN_CORE_AVAILABLE_PATH`   | `$PLUGIN_CORE_PATH/available"`  | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory that stores all available core plugins. |
+| `PLUGIN_CORE_ENABLED_PATH`     | `$PLUGIN_CORE_PATH/enabled"`    | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | The directory that stores all enabled core plugins. |
+| `DOKKU_LOGS_DIR`               | `/var/log/dokku`                | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | Where dokku logs should be written to. |
+| `DOKKU_EVENTS_LOGFILE`         | `$DOKKU_LOGS_DIR/events.log`    | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | Where the events log file is written to. |
+| `DOKKU_APP_NAME`               | none                            | `--app APP` flag                                                                                                                                 | Name of application to work on. Respected by core plugins. |
+| `DOKKU_APPS_FORCE_DELETE`      | none                            | `--force` flag                                                                                                                                   | Whether to force delete an application. Also used by other plugins for destructive actions. |
+| `DOKKU_DETACH_CONTAINER`       | none                            | `--detach` flag                                                                                                                                  | Whether to detach a container started via `dokku run`. |
+| `DOKKU_QUIET_OUTPUT`           | none                            | `--quiet` flag                                                                                                                                   | Silences certain header output for `dokku` commands. |
+| `DOKKU_RM_CONTAINER`           | none                            | `dokku config:set` <br /> `--rm-container` flag <br /> `--rm` flag                                                                               | Whether to keep `dokku run` containers around or not. |
+| `DOKKU_TRACE`                  | none                            | `dokku trace on`   <br /> `dokku trace false` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
+| `DOKKU_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`                                                                                                                            | |
+| `DOKKU_CHECKS_SKIPPED`         | none                            | `dokku checks:skip`                                                                                                                              | |
+| `DOKKU_CHECKS_WAIT`            | `5`                             | `dokku config:set`                                                                                                                               | Wait this many seconds for the container to start before running checks.
+| `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_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_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_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

@@ -0,0 +1,112 @@
+# Nginx Configuration
+
+Dokku uses nginx as its server for routing requests to specific applications. By default, access and error logs are written for each app to `/var/log/nginx/${APP}-access.log` and `/var/log/nginx/${APP}-error.log` respectively
+
+```
+nginx:access-logs <app> [-t]             # Show the nginx access logs for an application (-t follows)
+nginx:build-config <app>                 # (Re)builds nginx config for given app
+nginx:error-logs <app> [-t]              # Show the nginx error logs for an application (-t follows)
+```
+
+## Customizing the nginx configuration
+
+> New as of 0.5.0
+
+Dokku uses a templating library by the name of [sigil](https://github.com/gliderlabs/sigil) to generate nginx configuration for each app. You may also provide a custom template for your application as follows:
+
+- Copy the following example template to a file named `nginx.conf.sigil` and either:
+  - If using a buildpack application, you __must__ check it into the root of your app repo.
+  - `ADD` it to your dockerfile `WORKDIR`
+  - if your dockerfile has no `WORKDIR`, `ADD` it to the `/app` folder
+
+> When using a custom `nginx.conf.sigil` file, depending upon your application configuration, you *may* be exposing the file externally. As this file is extracted before the container is run, you can, safely delete it in a custom `entrypoint.sh` configured in a Dockerfile `ENTRYPOINT`.
+
+> The default template is available [here](https://github.com/dokku/dokku/blob/master/plugins/nginx-vhosts/templates/nginx.conf.sigil), and can be used as a guide for your own, custom `nginx.conf.sigil` file. Please refer to the appropriate template file version for your Dokku version.
+
+### Available template variables
+
+```
+{{ .APP }}                          Application name
+{{ .APP_SSL_PATH }}                 Path to SSL certificate and key
+{{ .DOKKU_ROOT }}                   Global Dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
+{{ .DOKKU_APP_LISTENERS }}          List of IP:PORT pairs of app containers
+{{ .PROXY_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var)
+{{ .PROXY_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var)
+{{ .NOSSL_SERVER_NAME }}            List of non-SSL VHOSTS
+{{ .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)
+{{ .RAW_TCP_PORTS }}                List of exposed tcp ports as defined by Dockerfile `EXPOSE` directive (**Dockerfile apps only**)
+{{ .SSL_INUSE }}                    Boolean set when an app is SSL-enabled
+{{ .SSL_SERVER_NAME }}              List of SSL VHOSTS
+```
+
+> Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
+
+### Customizing via configuration files included by the default templates
+
+The default nginx.conf template will include everything from your apps `nginx.conf.d/` subdirectory in the main `server {}` block (see above):
+
+```
+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/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/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
+
+See the [domain configuration documentation](/docs/configuration/domains.md).
+
+## Customizing hostnames
+
+See the [customizing hostnames documentation](/docs/configuration/domains.md#customizing-hostnames).
+
+## Disabling VHOSTS
+
+See the [disabling vhosts documentation](/docs/configuration/domains.md#disabling-vhosts).
+
+## Default site
+
+See the [default site documentation](/docs/configuration/domains.md#default-site).
+
+## Running behind a load balancer
+
+See the [load balancer documentation](/docs/configuration/ssl.md#running-behind-a-load-balancer).
+
+## HSTS Header
+
+See the [HSTS documentation](/docs/configuration/ssl.md#hsts-header).
+
+## SSL Configuration
+
+See the [ssl documentation](/docs/configuration/ssl.md).
+
+## Disabling Nginx
+
+See the [proxy documentation](/docs/advanced-usage/proxy-management.md).
+
+## Managing Proxy Port mappings
+
+See the [proxy documentation](/docs/advanced-usage/proxy-management.md#proxy-port-mapping).

docs/configuration/ssl.md

@@ -5,16 +5,20 @@
 Dokku supports SSL/TLS certificate inspection and CSR/Self-signed certificate generation via the `certs` plugin. Note that whenever SSL/TLS support is enabled SPDY is also enabled.
 
 ```
-certs:add <app> CRT KEY                          Add an ssl endpoint to an app. Can also import from a tarball on stdin.
-certs:generate <app> DOMAIN                      Generate a key and certificate signing request (and self-signed certificate)
-certs:info <app>                                 Show certificate information for an ssl endpoint.
-certs:remove <app>                               Remove an SSL Endpoint from an app.
-certs:update <app> CRT KEY                       Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+certs:add <app> CRT KEY                  # Add an ssl endpoint to an app. Can also import from a tarball on stdin.
+certs:generate <app> DOMAIN              # Generate a key and certificate signing request (and self-signed certificate)
+certs:remove <app>                       # Remove an SSL Endpoint from an app.
+certs:report [<app>] [<flag>]            # Displays an ssl report for one or more apps
+certs:update <app> CRT KEY               # Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+```
 
+```shell
 # for 0.3.x
 dokku nginx:import-ssl <app> < certs.tar
 ```
 
+> Adding an ssl certificate before deploying an application will result in port mappings being updated. This may cause issues for applications that use non-standard ports, as those may 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.
+
 ## Per-application certificate management
 
 Dokku provides built-in support for managing SSL certificates on a per-application basis. SSL is managed via nginx outside of application containers, and as such can be updated on-the-fly without rebuilding containers. At this time, applications only support a single SSL certificate at a time. To support multiple domains for a single application, wildcard certificate usage is encouraged.
@@ -25,8 +29,7 @@ The `certs:add` command can be used to push a `tar` containing a certificate `.c
 
 ```shell
 tar cvf cert-key.tar server.crt server.key
-# replace APP with the name of your application
-dokku certs:add <app> < cert-key.tar
+dokku certs:add node-js-app < cert-key.tar
 ```
 
 > Note: If your `.crt` file came alongside a `.ca-bundle`, you'll want to concatenate those into a single `.crt` file before adding it to the `.tar`.
@@ -37,9 +40,9 @@ cat yourdomain_com.crt yourdomain_com.ca-bundle > server.crt
 
 #### SSL and Multiple Domains
 
-When an SSL certificate is associated to an application, the certificate will be associated with *all* domains currently associated with said application. Your certificate _should_ be associated with all of those domains, otherwise accessing the application will result in SSL errors. If you wish to remove one of the domains from the application, refer to the [domain configuration documentation](/dokku/deployment/domain-configuration/).
+When an SSL certificate is associated to an application, the certificate will be associated with *all* domains currently associated with said application. Your certificate _should_ be associated with all of those domains, otherwise accessing the application will result in SSL errors. If you wish to remove one of the domains from the application, refer to the [domain configuration documentation](/docs/configuration/domains.md).
 
-Note that with the default nginx template, requests will be redirected to the `https` version of the domain. If this is not the desired state of request resolution, you may customize the nginx template in use. For more details, see the [nginx documentation](/dokku/nginx/).
+Note that with the default nginx template, requests will be redirected to the `https` version of the domain. If this is not the desired state of request resolution, you may customize the nginx template in use. For more details, see the [nginx documentation](/docs/configuration/nginx.md).
 
 ### Certificate generation
 
@@ -47,53 +50,91 @@ Note that with the default nginx template, requests will be redirected to the `h
 
 The `certs:generate` command will walk you through the correct `openssl` commands to create a key, csr and a self-signed cert for a given app/domain. We automatically put the self-signed cert in place as well as add the specified domain to the application configuration.
 
-If you decide to obtain a CA signed certficate, you can import that certificate using the aformentioned `dokku certs:add` command.
-
-### Certificate information
-
-The `certs:info` command will simply inspect the install SSL cert and print out details. NOTE: The server-wide certificate will be inspect if installed and no app-specific certificate exists.
-
-```
-$ dokku certs:info node-js-app
------> Fetching SSL Endpoint info for node-js-app...
------> Certificate details:
-=====> Common Name(s):
-=====>    test.dokku.me
-=====> Expires At: Aug 24 23:32:59 2016 GMT
-=====> Issuer: C=US, ST=California, L=San Francisco, O=dokku.me, CN=test.dokku.me
-=====> Starts At: Aug 25 23:32:59 2015 GMT
-=====> Subject: C=US; ST=California; L=San Francisco; O=dokku.me; CN=test.dokku.me
-=====> SSL certificate is self signed.
-```
+If you decide to obtain a CA signed certificate, you can import that certificate using the aforementioned `dokku certs:add` command.
 
 ### Certificate removal
 
 The `certs:remove` command only works on app-specific certificates. It will `rm` the app-specific tls directory, rebuild the nginx configuration, and reload nginx.
 
+### Displaying certificate reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the apps ssl status using the `certs:report` command:
+
+```shell
+dokku certs:report
+```
+
+```
+=====> node-js-sample
+       Ssl dir:             /home/dokku/node-js-sample/tls
+       Ssl enabled:         true
+       Ssl hostnames:       *.node-js-sample.org node-js-sample.org
+       Ssl expires at:      Oct  5 23:59:59 2019 GMT
+       Ssl issuer:          C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO RSA Domain Validation Secure Server CA
+       Ssl starts at:       Oct  5 00:00:00 2016 GMT
+       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.node-js-sample.org
+       Ssl verified:        self signed.
+=====> python-sample
+       Ssl dir:             /home/dokku/python-sample/tls
+       Ssl enabled:         false
+       Ssl hostnames:
+       Ssl expires at:
+       Ssl issuer:
+       Ssl starts at:
+       Ssl subject:
+       Ssl verified:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku certs:report node-js-sample
+```
+
+```
+=====> node-js-sample ssl information
+       Ssl dir:             /home/dokku/node-js-sample/tls
+       Ssl enabled:         true
+       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=*.dokku.org
+       Ssl verified:        self signed.
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku certs:report node-js-sample --ssl-enabled
+```
 
 ## HSTS Header
 
-The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
+The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. Dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
 
 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-For` and `X-Forwarded-Port`. 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.
+Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-Port` and `X-Forwarded-For`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers.
 
-If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/dokku/nginx/#customizing-the-nginx-configuration)
+If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/docs/configuration/nginx.md#customizing-the-nginx-configuration)
 
-```shell
+```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;
 
-  # set a custom header for requests
-  add_header X-Served-By www-ec2-01;
-
   location    / {
     proxy_pass  http://{{ .APP }};
     proxy_http_version 1.1;
@@ -122,3 +163,7 @@ Only use this option if:
 If it's possible to make HTTP/S requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
 
 This could result in security issue, for example, if your application looks at the value of the `X-Forwarded-Proto` to determine if the request was made over HTTPS.
+
+### 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`.

docs/deployment/application-deployment.md

@@ -6,6 +6,7 @@ Once Dokku has been configured with at least one user, applications can be deplo
 
 ```shell
 # from your local machine
+# SSH access to github must be enabled on this host
 git clone git@github.com:heroku/ruby-rails-sample.git
 ```
 
@@ -14,16 +15,16 @@ 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
 ```
 
 ### Create the backing services
 
-When you create a new app, Dokku by default *does not* provide any datastores such as MySQL or PostgreSQL. You will need to install plugins to handle that, but fortunately [Dokku has official plugins](/dokku/plugins/#official-plugins-beta) for common datastores. Our sample app requires a PostgreSQL service:
+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
@@ -32,14 +33,14 @@ sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
 dokku postgres:create rails-database
 ```
 
-> Each services may take a few moments to create.
+> Each service may take a few moments to create.
 
 ### Linking backing services to applications
 
 Once the service creation is complete, set the `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
 ```
@@ -52,11 +53,15 @@ Now you can deploy the `ruby-rails-sample` app to your Dokku server. All you hav
 
 ```shell
 # from your local machine
+# the remote username *must* be dokku or pushes will fail
+cd ruby-rails-sample
 git remote add dokku dokku@dokku.me:ruby-rails-sample
 git push dokku master
 ```
 
-You should see output similar to the following:
+> 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.
@@ -78,69 +83,42 @@ Total 231 (delta 93), reused 147 (delta 53)
        Using rake 10.4.2
 
 ...
-```
 
-When the deploy finishes, the application's URL will be shown.
-
-```shell
 =====> Application deployed:
        http://ruby-rails-sample.dokku.me
 ```
 
+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/).
 
-### Removing a deployed app
-
-You can also remove an application from your Dokku installation. This will unlink all linked services and destroy any config related to the application. Note that linked services will retain their data for later use (or removal).
-
-```shell
-# on your dokku host
-# replace APP with the name of your application
-dokku apps:destroy APP
-```
-
-This will prompt you to verify the application's name before destroying it. You may also use the `--force` flag to circumvent this verification process:
-
-```shell
-# on your dokku host
-# replace APP with the name of your application
-dokku --force apps:destroy APP
-```
-
-### Renaming a deployed app
-
-> New as of 0.4.7
-
-You can rename a deployed app using the `apps:rename` CLI tool:
-
-```shell
-# on your dokku host
-dokku apps:rename OLD_NAME NEW_NAME
-```
-
-This will copy all of your app's contents into a new app directory with the name of your choice, delete your old app, then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
-
-### 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```
-
-You can also support pushing multiple branches using the [receive-branch](/dokku/development/plugin-triggers/#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
 ```
 
+### Re-Deploying / restarting
+
+If you need to re-deploy (or restart) your app: 
+
+```shell
+# on the Dokku host
+dokku ps:rebuild ruby-rails-sample
+```
+
+See the [process scaling documentation](/docs/deployment/process-management.md) for more information.
+
 ### Deploying with private git submodules
 
 Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.
 
 ```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
@@ -152,28 +130,40 @@ Note that if the buildpack or dockerfile build process require ssh key access fo
 
 The name of remote repository is used as the name of application to be deployed, as for example above:
 
-    $ git remote add dokku dokku@dokku.me:ruby-rails-sample
-    $ git push dokku master
+```shell
+# from your local machine
+# the remote username *must* be dokku or pushes will fail
+git remote add dokku dokku@dokku.me:ruby-rails-sample
+git push dokku master
+```
 
-Is deployed to,
-
-    remote: -----> Application deployed:
-    remote:        http://ruby-rails-sample.dokku.me
+```
+remote: -----> Application deployed:
+remote:        http://ruby-rails-sample.dokku.me
+```
 
 You can also specify fully qualified names, say `app.dokku.me`, as
 
-    $ git remote add dokku dokku@dokku.me:app.dokku.me
-    $ git push dokku master
+```shell
+# from your local machine
+# the remote username *must* be dokku or pushes will fail
+git remote add dokku dokku@dokku.me:app.dokku.me
+git push dokku master
+```
 
-So, after deployment the application will be available at,
-
-    remote: -----> Application deployed:
-    remote:        http://app.dokku.me
+```
+remote: -----> Application deployed:
+remote:        http://app.dokku.me
+```
 
 This is in particular useful, then you want to deploy to root domain, as
 
-    $ git remote add dokku dokku@dokku.me:dokku.me
-    $ git push dokku master
+```shell
+# from your local machine
+# the remote username *must* be dokku or pushes will fail
+git remote add dokku dokku@dokku.me:dokku.me
+git push dokku master
+```
 
     ... deployment ...
 
@@ -188,24 +178,36 @@ As of 0.5.x, this function removes all containers with the label `dokku` where t
 
 ## Adding deploy users
 
-See the [user management documentation](/dokku/deployment/user-management).
+See the [user management documentation](/docs/deployment/user-management.md).
 
 ## Default vhost
 
-See the [nginx documentation](/dokku/nginx/#default-site).
+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](/dokku/deployment/dockerfiles/).
-
-## Specifying a custom buildpack
-
-See the [buildpack documentation](/dokku/deployment/buildpacks/).
+See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md).
 
 ## Image tagging
 
-See the [image tagging documentation](/dokku/deployment/images).
+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
+
+See the [application management documentation](/docs/deployment/application-management.md#renaming-a-deployed-app).
 
 ## Zero downtime deploy
 
-See the [zero-downtime deploy documentation](/dokku/checks-examples/).
+See the [zero-downtime deploy documentation](/docs/deployment/zero-downtime-deploys.md).

docs/deployment/application-management.md

@@ -0,0 +1,237 @@
+# Application Management
+
+> New as of 0.3.1
+
+```
+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
+
+### Listing Applications
+
+> New as of 0.8.1. Use the `apps` command for older versions.
+
+You can easily list all available applications using the `apps:list` command:
+
+```shell
+dokku apps:list
+```
+
+```
+=====> My Apps
+node-js-app
+python-app
+```
+
+Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.
+
+```shell
+dokku --quiet apps:list
+```
+
+```
+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:
+
+```shell
+dokku apps:create node-js-app
+```
+
+```
+Creating node-js-app... done
+```
+
+Once created, you can configure the application as normal, and deploy the application whenever ready. This is useful for cases where you may wish to do any of the following kinds of tasks:
+
+- configure domain names and ssl certificates
+- create and link datastores
+- set environment variables
+
+### Removing a deployed app
+
+In some cases, you may need to destroy an application, whether it is because the application is temporary or because it was misconfigured. In these cases, you can use the `apps:destroy` command. Performing any destructive actions in Dokku requires confirmation, and this command will ask for the name of the application being deleted before doing so.
+
+```shell
+dokku apps:destroy node-js-app
+```
+
+```
+ !     WARNING: Potentially Destructive Action
+ !     This command will destroy node-js-app (including all add-ons).
+ !     To proceed, type "node-js-app"
+
+> node-js-app
+Destroying node-js-app (including all add-ons)
+```
+
+This will prompt you to verify the application's name before destroying it. You may also use the `--force` flag to circumvent this verification process:
+
+```shell
+dokku --force apps:destroy node-js-app
+```
+
+```
+Destroying node-js-app (including all add-ons)
+```
+
+
+Destroying an application will unlink all linked services and destroy any config related to the application. Note that linked services will retain their data for later use (or removal).
+
+### Renaming a deployed app
+
+> New as of 0.4.7
+
+You can rename a deployed app using the `apps:rename` command. Note that the application *must* have been deployed at least once, or the rename will not complete successfully:
+
+```shell
+dokku apps:rename node-js-app io-js-app
+```
+
+```
+Destroying node-js-app (including all add-ons)
+-----> Cleaning up...
+-----> Building io-js-app from herokuish...
+-----> Adding BUILD_ENV to build environment...
+-----> Node.js app detected
+
+-----> Creating runtime environment
+
+...
+
+=====> Application deployed:
+       http://io-js-app.ci.dokku.me
+
+Renaming node-js-app to io-js-app... done
+```
+
+This will copy all of your app's contents into a new app directory with the name of your choice, delete your old app, then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
+
+### Cloning an existing app
+
+> 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:
+
+```shell
+dokku apps:clone node-js-app io-js-app
+```
+
+```
+Cloning node-js-app to io-js-app... done
+```
+
+This will copy all of your app's contents into a new app directory with the name of your choice and then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
+
+> Warning: If you have exposed specific ports via docker-options, added generic domains, or performed anything that cannot be done against multiple applications, `apps:clone` may result in errors.
+
+By default, Dokku will deploy this new application, though you can skip the deploy by using the `--skip-deploy` flag:
+
+```shell
+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
+
+You can get a report about the deployed apps using the `apps:report` command:
+
+```shell
+dokku apps:report
+```
+
+```
+=====> node-js-app
+       App dir:             /home/dokku/node-js-app
+       Git sha:             dbddc3f
+       Deploy source:       git
+       Locked:              false
+=====> python-sample
+not deployed
+=====> ruby-sample
+       App dir:             /home/dokku/ruby-sample
+       Git sha:             a2d477c
+       Deploy source:       git
+       Locked:              false
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku apps:report node-js-app
+```
+
+```
+=====> node-js-app
+       App dir:             /home/dokku/node-js-app
+       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:
+
+```shell
+dokku apps:report node-js-app --git-sha
+```

docs/deployment/deployment-tasks.md

@@ -1,57 +0,0 @@
-# Deployment Tasks
-
-> New as of 0.5.0
-
-Sometimes you need to run a command on at deployment time, but before an app is completely deployed.
-Common use cases include:
-
-* Checking a database is initialised
-* Running database migrations
-* Any commands required to set up the server (e.g. something like a Django `collectstatic`)
-
-## `app.json` and `scripts.dokku`
-
-Dokku accomplishes this by using an `app.json` file. We (mostly) use the same format as Heroku's [app.json](https://devcenter.heroku.com/articles/app-json-schema).
-However, dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
-Simply place an `app.json` file in the root of your repository or for dockerfile apps, `ADD` it to /app.
->NOTE: postdeploy changes are *NOT* committed to the app image.
-
-### Example app.json
-
-```
-{
-  "name": "barebones nodejs",
-  "description": "A barebones Node.js app using Express 4.",
-  "keywords": [
-    "nodejs",
-    "express"
-  ],
-  "repository": "https://github.com/michaelshobbs/node-js-sample",
-  "scripts": {
-    "dokku": {
-      "predeploy": "touch /app/predeploy.test",
-      "postdeploy": "curl https://some.external.api.service.com/deployment?state=success"
-    }
-  },
-  "env": {
-    "SECRET_TOKEN": {
-      "description": "A secret key for verifying the integrity of signed cookies.",
-      "value": "secret"
-    },
-    "WEB_CONCURRENCY": {
-      "description": "The number of processes to run.",
-      "generator": "echo 5"
-    }
-  },
-  "image": "gliderlabs/herokuish",
-  "addons": [
-    "dokku-postgres",
-    "dokku-redis"
-  ],
-  "buildpacks": [
-    {
-      "url": "https://github.com/heroku/heroku-buildpack-nodejs"
-    }
-  ]
-}
-```

docs/deployment/domain-configuration.md

@@ -1,98 +0,0 @@
-# Domain Configuration
-
-> New as of 0.3.10
-
-```shell
-domains:add <app> DOMAIN                                                                     Add a domain to app
-domains [<app>]                                                                              List domains
-domains:clear <app>                                                                          Clear all domains for app
-domains:disable <app>                                                                        Disable VHOST support
-domains:enable <app>                                                                         Enable VHOST support
-domains:remove <app> DOMAIN                                                                  Remove a domain from app
-domains:set-global <domain>                                                                  Set global domain name
-```
-
-## Customizing hostnames
-
-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:set-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`.
-
-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:
-
-```shell
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
-
-NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
-echo "$NEW_SUBDOMAIN.$VHOST"
-```
-
-If the `nginx-hostname` has no output, the normal hostname algorithm will be executed.
-
-## Disabling VHOSTS
-
-If desired, it is possible to disable vhosts with the domains plugin.
-
-```shell
-dokku domains:disable myapp
-```
-
-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.)
-
-
-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
-
-# add a domain to an app
-dokku domains:add myapp example.com
-
-# list custom domains for app
-dokku domains myapp
-
-# clear all custom domains for app
-dokku domains:clear myapp
-
-# remove a custom domain from app
-dokku domains:remove myapp example.com
-```
-
-## Default site
-
-By default, dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to the global nginx configuration. This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).
-
-```
-server {
-  listen 80 default_server;
-  listen [::]:80 default_server;
-
-  server_name _;
-  return 410;
-  log_not_found off;
-}
-```
-
-You may also wish to use a separate vhost in your `/etc/nginx/sites-enabled` directory. To do so, create the vhost in that directory as `/etc/nginx/sites-enabled/00-default.conf`. You will also need to change two lines in the main `nginx.conf`:
-
-```
-# Swap both conf.d include line and the sites-enabled include line. From:
-include /etc/nginx/conf.d/*.conf;
-include /etc/nginx/sites-enabled/*;
-
-# to the following
-
-include /etc/nginx/sites-enabled/*;
-include /etc/nginx/conf.d/*.conf;
-```
-
-Alternatively, you may push an app to your dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.

docs/deployment/logs.md

@@ -0,0 +1,33 @@
+# Log Management
+
+```
+logs <app>           # display recent log output
+```
+
+## Usage
+
+### Application Logs
+You can easily get logs of an application using the `logs` command:
+
+```shell
+dokku logs node-js-app
+```
+
+## Behavioral modifiers
+
+Dokku also supports certain command-line arguments that augment the `log` command's behavior.
+
+```
+-n, --num NUM        # the number of lines to display
+-p, --ps PS          # only display logs from the given process
+-t, --tail           # continually stream logs
+-q, --quiet          # display raw logs without colors, time and names
+```
+
+You can use these modifiers as follows:
+
+
+```shell
+dokku logs node-js-app -t -p web
+```
+will show logs continually from the web process.

docs/deployment/methods/buildpacks.md

@@ -4,22 +4,29 @@ Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.co
 
 - Use `dokku config:set` to set the `BUILDPACK_URL` environment variable.
 - Add `BUILDPACK_URL` to a committed `.env` file in the root of your repository.
-  - See the [environment variable documentation](/dokku/configuration-management/) for more details.
+  - 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.
+In certain cases you may want to specify a custom buildpack. While Dokku uses herokuish to support all the [official heroku buildpacks](https://github.com/gliderlabs/herokuish#buildpacks), it is possible that the buildpack detection does not work well for your application. As well, you may wish to use a custom buildpack to handle specific application logic.
 
-To use a specific buildpack, you can run the following dokku command:
+To use a specific buildpack, you can run the following Dokku command:
 
 ```shell
-# replace APP with the name of your application
 # replace REPOSITORY_URL with your buildpack's url
-dokku config:set APP BUILDPACK_URL=REPOSITORY_URL
+dokku config:set node-js-app BUILDPACK_URL=REPOSITORY_URL
 
 # example: using a specific ruby buildpack version
-dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby.git#v142
+dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby.git#v142
 ```
 
 Please check the documentation for your particular buildpack as you may need to include configuration files (such as a Procfile) in your project root.
@@ -45,21 +52,19 @@ As Dokku pins all buildpacks via herokuish releases, there may be occasions wher
 
 ```shell
 # using the latest nodejs buildpack
-# replace APP with the name of your application
-dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs
+dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs
 ```
 
 You may also wish to use a **specific** version of a buildpack, which is also simple
 
 ```shell
 # using v87 of the nodejs buildpack
-# replace APP with the name of your application
-dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs#v87
+dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs#v87
 ```
 
 ## Specifying commands via Procfile
 
-While many buildpacks have a default command that is run when a detected repository is pushed, it is possible to override this command via a Procfile. A Procfile can also be used to specify multiple commands, each of which is subject to process scaling. See the [process scaling documentation](/dokku/process-management/) for more details around scaling individual processes.
+While many buildpacks have a default command that is run when a detected repository is pushed, it is possible to override this command via a Procfile. A Procfile can also be used to specify multiple commands, each of which is subject to process scaling. See the [process scaling documentation](/docs/deployment/process-management.md) for more details around scaling individual processes.
 
 A Procfile is a file named `Procfile`. It should be named `Procfile` exactly, and not anything else. For example, `Procfile.txt` is not valid. The file should be a simple text file.
 
@@ -75,21 +80,12 @@ The syntax for declaring a `Procfile` is as follows. Note that the format is one
 
 If, for example, you have multiple queue workers and wish to scale them separately, the following would be a valid way to work around the requirement of not duplicating process types:
 
-```
+```Procfile
 worker:           env QUEUE=* bundle exec rake resque:work
 importantworker:  env QUEUE=important bundle exec rake resque:work
 ```
 
-The `web` process type holds some significance in that it is the only process type that is automatically scaled to `1` on the initial application deploy. See the [process scaling documentation](/dokku/process-management/) for more details around scaling individual processes.
-
-## Clearing buildpack cache
-
-Building containers with buildpacks currently results in a persistent `cache` directory between deploys. If you need to clear this cache directory for any reason, you may do so by running the following shell command:
-
-```shell
-# replace APP with the name of your application
-sudo rm -rf /home/dokku/APP/cache/*
-```
+The `web` process type holds some significance in that it is the only process type that is automatically scaled to `1` on the initial application deploy. See the [process scaling documentation](/docs/deployment/process-management.md) for more details around scaling individual processes.
 
 ## Curl Build Timeouts
 
@@ -98,6 +94,10 @@ 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_CONNECT_TIMEOUT=30
+dokku config:set --global CURL_TIMEOUT=1200
+dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
+
+## Clearing buildpack cache
+
+See the [repository management documentation](/docs/advanced-usage/repository-management.md#clearing-app-cache).

docs/deployment/methods/dockerfiles.md

@@ -6,35 +6,71 @@ While Dokku normally defaults to using [heroku buildpacks](https://devcenter.her
 
 > Dockerfile support is considered a **Power User** feature. By using Dockerfile-based deployment, you agree that you will not have the same comfort as that enjoyed by Buildpack users, and Dokku features may work differently. Differences between the two systems will be documented here.
 
-To use a dockerfiles for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers **except** in the following two cases:
+To use a dockerfile for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers **except** in the following two cases:
 
 - The application has a `BUILDPACK_URL` environment variable set via the `dokku config:set` command or in a committed `.env` file. In this case, Dokku will use your specified buildpack.
 - The application has a `.buildpacks` file in the root of the repository. In this case, Dokku will use your specified buildpack(s).
 
-## 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.
+```shell
+dokku config:unset --no-restart node-js-app DOKKU_PROXY_PORT_MAP 
+```
 
-> NOTE: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`
+## Build-time Configuration Variables
 
-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.
+For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available only during runtime.
 
-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'd like to investigate alternative proxy methods, please refer to our [proxy documentation](/dokku/proxy/).
+For users that require customization in the `build` phase, you may use build arguments via the [docker-options plugin](docs/advanced-usage/docker-options.md):
+
+```shell
+dokku docker-options:add node-js-app build '--build-arg NODE_ENV=production'
+```
+
+Once set, the Dockerfile usage would be as follows:
+
+```Dockerfile
+FROM debian:jessie
+
+# set the argument default
+ARG NODE_ENV=production
+
+# use the argument
+RUN echo $NODE_ENV
+```
+
+You may also set the argument as an environment variable
+
+```Dockerfile
+FROM debian:jessie
+
+# set the argument default
+ARG NODE_ENV=production
+
+# assign it to an environment variable
+# we can wrap the variable in brackets
+ENV NODE_ENV ${NODE_ENV}
+
+# or omit them completely
+
+# use the argument
+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`:
 
-```
+```Dockerfile
 ENTRYPOINT ["node"]
 ```
 
 You can do:
 
-```
-dokku config:set APP DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
+```shell
+dokku config:set node-js-app DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
 ```
 
 To tell docker what to run.
@@ -52,14 +88,14 @@ When you deploy your app a Docker image will be built, the `Procfile` will be ex
 (it must be in the folder defined in your `Dockerfile` as `WORKDIR` or `/app`) and the commands
 in it will be passed to `docker run` to start your process(es). Here's an example `Procfile`:
 
-```
+```Procfile
 web: bin/run-prod.sh
 worker: bin/run-worker.sh
 ```
 
 And `Dockerfile`:
 
-```
+```Dockerfile
 FROM debian:jessie
 WORKDIR /app
 COPY . ./
@@ -72,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

@@ -1,39 +1,82 @@
-# Image Tagging
+# Docker Image Tag Deployment
 
 > New as of 0.4.0
 
-The dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
-
 ```
-tags <app>                                       List all app image tags
-tags:create <app> <tag>                          Add tag to latest running app image
-tags:deploy <app> <tag>                          Deploy tagged app image
-tags:destroy <app> <tag>                         Remove app image tag
+tags <app>                                     # List all app image tags
+tags:create <app> <tag>                        # Add tag to latest running app image
+tags:deploy <app> <tag>                        # Deploy tagged app image
+tags:destroy <app> <tag>                       # Remove app image tag
 ```
 
-Example:
+The Dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+
+> When triggering `dokku ps:rebuild APP` on an application deployed via the `tags` plugin, the following may occur:
+>
+> - Applications previously deployed via another method (`git`/`tar`): The application may revert to a state before the latest custom image tag was deployed.
+> - Applications that were only ever deployed via the `tags` plugin: No action will be taken against your application.
+>
+> Please use the `tags:deploy` command when redeploying an application deployed via docker image.
+
+## 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:
+
+```shell
+dokku tags node-js-app
+```
 
 ```
-$ dokku tags node-js-app
 =====> Image tags for dokku/node-js-app
 REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
 dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
+```
 
-$ dokku tags:create node-js-app v0.9.0
-=====> Added v0.9.0 tag to dokku/node-js-app
+### Creating a tag
 
-$ dokku tags node-js-app
+You can also create new tags for that app using the `tags:create` function. Tags should conform to the docker tagging specification for your docker version. As of 1.10, that specification is available [here](https://github.com/docker/docker/blob/master/image/spec/v1.1.md), while users of older versions can check the documentation [here](https://github.com/docker/docker/blob/master/image/spec/v1.md).
+
+```shell
+dokku tags:create node-js-app v1
+```
+
+```
+=====> Added v1 tag to dokku/node-js-app
+```
+
+Once the tag is created, you can see the output by running the `tags` command again.
+
+```shell
+dokku tags node-js-app
+```
+
+```
 =====> Image tags for dokku/node-js-app
 REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
 dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
-dokku/node-js-app   v0.9.0              936a42f25901        About a minute ago   1.025 GB
+dokku/node-js-app   v1                  936a42f25901        About a minute ago   1.025 GB
+```
 
-$ dokku tags:deploy node-js-app v0.9.0
------> Releasing node-js-app (dokku/node-js-app:v0.9.0)...
------> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
+### Deploying an image tag
+
+Finally, you can also deploy a local image using the `tags:deploy` command.
+
+```shell
+dokku tags:deploy node-js-app v1
+```
+
+```
+-----> Releasing node-js-app (dokku/node-js-app:v1)...
+-----> Deploying node-js-app (dokku/node-js-app:v1)...
 -----> Running pre-flight checks
        For more efficient zero downtime deployments, create a file CHECKS.
-       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       See http://dokku.viewdocs.io/dokku/deployment/zero-downtime-deploys/ for examples
        CHECKS file not found in container: Running simple container check...
 -----> Waiting for 10 seconds ...
 -----> Default container check successful!
@@ -53,14 +96,15 @@ $ dokku tags:deploy node-js-app v0.9.0
 =====> 025eec3fa3b442fded90933d58d8ed8422901f0449f5ea0c23d00515af5d3137
 =====> Application deployed:
        http://node-js-app.dokku.me
-
 ```
 
-## Deploying from a Docker Registry
+## Image Workflows
+
+### Deploying from a Docker Registry
 
 You can alternatively add image pulled from a docker Registry and deploy app from it by using tagging feature. In this example, we are deploying from Docker Hub.
 
-1. Create dokku app as usual
+1. Create Dokku app as usual
 
     ```shell
     dokku apps:create test-app
@@ -84,14 +128,11 @@ 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
+### Deploying an image from CI
 
 To ensure your builds are always reproducible, it's considered bad practice to store build
 artifacts in your repository. For some projects however, building artifacts during deployment
-to dokku may affect the performance of running applications.
+to Dokku may affect the performance of running applications.
 
 One solution is to build a finished Docker image on a CI service (or even locally) and deploy
 it directly to the host running dokku.
@@ -99,11 +140,11 @@ it directly to the host running dokku.
 1. Build image on CI (or locally)
 
     ```shell
-    docker build -t dokku/test-app:v12
+    docker build -t dokku/test-app:v12 .
     # Note: The image must be tagged `dokku/<app-name>:<version>`
     ```
 
-2. Deploy image to dokku host
+2. Deploy image to Dokku host
 
     ```shell
     docker save dokku/test-app:v12 | ssh my.dokku.host "docker load | dokku tags:deploy test-app v12"
@@ -116,9 +157,14 @@ Here's a more complete example using the above method:
 
 ```shell
 # build the image
-docker build -t dokku/test-app:v12
+docker build -t dokku/test-app:v12 .
 # copy the image to the dokku host
 docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load"
 # tag and deploy the image
 ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest"
 ```
+
+## Related articles
+- [Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md)
+- [Defining Environment Variables](/docs/configuration/environment-variables.md)
+- [Setting up the Ports](/docs/advanced-usage/proxy-management.md)

docs/deployment/methods/tar.md

@@ -0,0 +1,36 @@
+# Tarball Deployment
+
+> New as of 0.4.0
+
+```
+tar:from <app> <url>                           # Loads an app tarball from url
+tar:in <app>                                   # Reads an tarball containing the app from stdin
+```
+
+> When triggering `dokku ps:rebuild APP` on an application deployed via the `tar` plugin, the following may occur:
+>
+> - Applications previously deployed via another method (`git`): The application may revert to a state before the latest custom image tag was deployed.
+> - Applications that were only ever deployed via the `tar` plugin: The application will be properly rebuilt.
+>
+> Please use the appropriate `tar` command when redeploying an application deployed via tarball.
+
+## Usage
+
+### Deploying from a tarball
+
+In some cases, it may be useful to deploy an application from a tarball. For instance, if you implemented a non-git based deployment plugin, tarring the generated artifact may be an easier route to interface with the existing Dokku infrastructure.
+
+You can place the tarball on an external webserver and deploy via the `tar:from` command.
+
+```shell
+dokku tar:from node-js-app https://dokku.me/releases/node-js-app/v1
+```
+
+### Deploying via stdin
+
+As an alternative, a deploy can be trigged from a tarball read from stdin using the `tar:in` command:
+
+```shell
+# run from the generated artifact directory
+tar c . $* | dokku tar:in node-js-app
+```

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.
@@ -29,21 +29,21 @@ dokku run my-app console
 If you want to remove the container after a command has started, you can run the following command:
 
 ```shell
-# keep `run` containers around
+# don't keep `run` containers around
 dokku config:set --global DOKKU_RM_CONTAINER=1
 
 # revert the above setting and keep containers around
 dokku config:unset --global DOKKU_RM_CONTAINER
 ```
 
-You may also use the `--rm-container` or `--rm` dokku flags to remove the containers automatically:
+You may also use the `--rm-container` or `--rm` Dokku flags to remove the containers automatically:
 
 ```shell
 dokku --rm-container run node-js-app ls -lah
 dokku --rm run node-js-app ls -lah
 ```
 
-Finally, you may wish to run a container in "detached" mode via the `--detach` dokku flag. Running a process in detached mode will immediately return a `CONTAINER_ID`. It is up to the user to then further manage this container in whatever manner they see fit, as dokku will *not* automatically terminate the container.
+Finally, you may wish to run a container in "detached" mode via the `--detach` Dokku flag. Running a process in detached mode will immediately return a `CONTAINER_ID`. It is up to the user to then further manage this container in whatever manner they see fit, as Dokku will *not* automatically terminate the container.
 
 ```shell
 dokku --detach run node-js-app ls -lah
@@ -68,7 +68,7 @@ For tasks that should not be interrupted, run is the **preferred** method of han
 > New as of 0.4.0
 
 ```
-enter <app>  [<container-type> || --container-id <container-id>]   Connect to a specific app container
+enter <app>  [<container-type> || --container-id <container-id>]  # Connect to a specific app container
 ```
 
 The `enter` command can be used to enter a running container. The following variations of the command exist:
@@ -95,7 +95,7 @@ dokku enter node-js-app web python script/background-worker.py
 
 Your procfile can have the following entry:
 
-```
+```Procfile
 cron: sleep infinity
 ```
 
@@ -108,7 +108,7 @@ dokku ps:scale node-js-app cron=1
 You can now run all your commands in that container:
 
 ```shell
-dokku enter api cron some-command
+dokku enter node-js-app cron some-command
 ```
 
 Note that you can also run multiple commands at the same time to reduce memory usage, though that may result in polluting the container environment.
@@ -119,8 +119,8 @@ For tasks that will properly resume, you **should** use the above method, as run
 
 Regularly scheduled tasks can be a bit of a pain with dokku. The following are general recommendations to follow to help ensure successful task runs.
 
-- Use the dokku user's crontab
-  - If you do not, dokku will attempt to execute with sudo dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
+- Use the `dokku` user's crontab
+  - If you do not, the `dokku` binary will attempt to execute with `sudo` dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
 - Add a `MAILTO` environment variable to ship cron emails to yourself.
 - Add a `PATH` environment variable or specify the full path to binaries on the host.
 - Add a `SHELL` environment variable to specify bash when running commands.
@@ -138,9 +138,9 @@ Regularly scheduled tasks can be a bit of a pain with dokku. The following are g
 
 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

@@ -0,0 +1,200 @@
+# Process and Container Management
+
+> New as of 0.3.14, Enhanced in 0.7.0
+
+```
+ps <app>                                       # List processes running in app container(s)
+ps:rebuild <app>                               # Rebuild an app from source
+ps:rebuildall                                  # Rebuild all apps from source
+ps:report [<app>] [<flag>]                     # Displays a process report for one or more apps
+ps:restart <app>                               # Restart app container(s)
+ps:restart-policy <app>                        # Shows the restart-policy for an app
+ps:restartall                                  # Restart all deployed app containers
+ps:scale <app> <proc>=<count> [<proc>=<count>] # Get/Set how many instances of a given process to run
+ps:set-restart-policy <app> <policy>           # Sets app restart-policy
+ps:start <app>                                 # Start app container(s)
+ps: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).
+
+> The `web` proctype is the only proctype that will invoke custom checks as defined by a CHECKS file. It is also the only process type that will be launched in a container that is either proxied via nginx or bound to an external port.
+
+## Usage
+
+### Listing processes running in an app container
+
+To find out if your application's containers are running the commands you expect, simply run the `ps` command against that application.
+
+```shell
+dokku ps node-js-app
+```
+
+### Rebuilding applications
+
+There are some Dokku commands which will not automatically rebuild an application's environment, or which can be told to skip a rebuild.  For instance, you may wish to run multiple `config:set` commands without a restart so as to speed up configuration. In these cases, you can ultimately trigger an application rebuild using `ps:rebuild`
+
+```shell
+dokku ps:rebuild node-js-app
+```
+
+You may also rebuild all applications at once, which is useful when enabling/disabling a plugin that modifies all applications:
+
+```shell
+dokku ps:rebuildall
+```
+
+> The `ps:rebuild` and `ps:rebuildall` commands only work for applications for which there is a source, and thus
+> will only always work deterministically for git-deployed application. Please see
+> the [images documentation](/docs/deployment/methods/images.md) and [tar documentation](/docs/deployment/methods/tar.md)
+> in for more information concerning rebuilding those applications.
+
+### Restarting applications
+
+Applications can be restarted, which is functionally identical to calling the `release_and_deploy` function on an application. Please not that any linked containers *must* be started before the application in order to have a successful boot.
+
+```shell
+dokku ps:restart node-js-app
+```
+
+You may also trigger a restart on all applications at one time:
+
+```shell
+dokku ps:restartall
+```
+
+### `ps:scale` command
+
+Dokku can also manage scaling itself via the `ps:scale` command. This command can be used to scale multiple process types at the same time.
+
+```shell
+dokku ps:scale node-js-app web=1
+```
+
+Multiple process types can be scaled at once:
+
+```shell
+dokku ps:scale node-js-app web=1 worker=1
+```
+
+Issuing the `ps:scale` command with no process type argument will output the current scaling settings for an application:
+
+```shell
+dokku ps:scale node-js-app
+```
+
+```
+-----> Scaling for node-js-app
+-----> proctype           qty
+-----> --------           ---
+-----> web                1
+-----> worker             1
+```
+
+### Stopping applications
+
+Deployed applications can be stopped using the `ps:stop` command. This turns off all running containers for an application, and will result in a `502 Bad Gateway` response for the default nginx proxy implementation.
+
+```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.
+
+```shell
+dokku ps:start node-js-app
+```
+
+## Restart Policies
+
+> New as of 0.7.0
+
+By default, Dokku will automatically restart containers that exit with a non-zero status up to 10 times via the [on-failure Docker restart policy](https://docs.docker.com/engine/reference/run/#restart-policies-restart).
+
+### 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`
+
+```shell
+dokku ps:restart-policy node-js-app
+```
+
+```
+=====> node-js-app restart-policy:
+on-failure:10
+```
+
+### Setting the restart policy
+
+You can configure this via the `ps:set-restart-policy` command:
+
+```shell
+# always restart an exited container
+dokku ps:set-restart-policy node-js-app always
+```
+
+```
+-----> Setting restart policy: always
+```
+
+```shell
+# never restart an exited container
+dokku ps:set-restart-policy node-js-app no
+```
+
+```
+-----> Setting restart policy: no
+```
+
+```shell
+# only restart it on Docker restart if it was not manually stopped
+dokku ps:set-restart-policy node-js-app unless-stopped
+```
+
+```
+-----> Setting restart policy: unless-stopped
+```
+
+```shell
+# restart only on non-zero exit status
+dokku ps:set-restart-policy node-js-app on-failure
+```
+
+```
+-----> Setting restart policy: on-failure
+```
+
+```shell
+# restart only on non-zero exit status up to 20 times
+dokku ps:set-restart-policy node-js-app on-failure:20
+```
+
+```
+-----> Setting restart policy: on-failure:20
+```
+
+Restart policies have no bearing on server reboot, and Dokku will always attempt to restart your applications at that point unless they were manually stopped.
+
+## Manually managing process scaling
+
+You can optionally _commit_ a `DOKKU_SCALE` file to the root of your repository - *not* to the /home/dokku/APP directory. Dokku expects this file to contain one line for every process defined in your Procfile.
+
+Example:
+
+```Procfile
+web=1
+worker=2
+```
+
+If it is not committed to the repository, the `DOKKU_SCALE` file will otherwise be automatically generated based on your `ps:scale` settings.
+
+> *NOTE*: Dokku will always use the DOKKU_SCALE file that ships with the repo to override any local settings.

docs/deployment/remote-commands.md

@@ -4,17 +4,17 @@ Dokku commands can be run over ssh. Anywhere you would run `dokku <command>`, ju
 The `-t` is used to request a pty. It is highly recommended to do so.
 To avoid the need to type the `-t` option each time, simply create/modify a section in the `.ssh/config` on the client side, as follows:
 
-```
+```ini
 Host dokku.me
-RequestTTY yes
+    RequestTTY yes
 ```
 
 ## Behavioral modifiers
 
 Dokku also supports certain command-line arguments that augment it's behavior. If using these over ssh, you must use the form `ssh -t dokku@dokku.me -- <command>`
-in order to avoid ssh interpretting dokku arguments for itself.
+in order to avoid ssh interpretting Dokku arguments for itself.
 
-```shell
+```
 --quiet                suppress output headers
 --trace                enable DOKKU_TRACE for current execution only
 --rm|--rm-container    remove docker container after successful dokku run <app> <command>
@@ -23,6 +23,6 @@ in order to avoid ssh interpretting dokku arguments for itself.
 
 ## Clients
 
-You may optionally use a client to connect to your dokku server. Most clients use the configured `git remote` to locate the dokku server, though some allow for overriding this via an environment variable or flag.
+You may optionally use a client to connect to your Dokku server. Most clients use the configured `git remote` to locate the Dokku server, though some allow for overriding this via an environment variable or flag.
 
-Please refer to the [clients](/dokku/community/clients/) list for more details.
+Please refer to the [clients](/docs/community/clients.md) list for more details.

docs/deployment/user-management.md

@@ -1,48 +1,95 @@
 # User Management
 
-While it is possible to use password-based authorization to push to Dokku, it is preferable to use key-based authentication for security.
-
-Users in dokku are managed via the `~/dokku/.ssh/authorized_keys` file. While you *can* manually edit this file, it is **highly** recommended that you follow the below steps to manage users on a dokku server.
-
-## SSHCommand
-
-Dokku uses the [`sshcommand`](https://github.com/dokku/sshcommand) utility to manage ssh keys for the dokku user. The following is the usage output for sshcommand.
+> New as of 0.7.0
 
 ```
-sshcommand create <user> <command>              # creates a user forced to run command when SSH connects
-sshcommand acl-add <user> <ssh-key-name>        # adds named SSH key to user from STDIN
-sshcommand acl-remove <user> <ssh-key-name>     # removes SSH key by name
-sshcommand help                                 # displays the usage help message
+ssh-keys:add <name> [/path/to/key]             # Add a new public key by pipe or path
+ssh-keys:list                                  # List of all authorized Dokku public ssh keys
+ssh-keys:remove <name>                         # Remove SSH public key by name
 ```
 
-In dokku's case, the `<user>` section is *always* `dokku`, as this is the system user that the dokku binary performs all it's actions. Keys are given unique names, which can be used in conjunction with the [user-auth](/dokku/development/plugin-triggers/#user-auth) plugin trigger to handle command authorization.
+When pushing to Dokku, ssh key based authorization is the preferred authentication method, for ease of use and increased security.
 
-## Adding deploy users
+Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the steps below to manage users on a Dokku server.
 
-You can add your public key to the dokku user's `~/dokku/.ssh/authorized_keys` file with the following command:
+> Users of older versions of Dokku may use the `sshcommand` binary to manage keys instead of the `ssh-keys` plugin. Please refer to the Dokku documentation for your version for more details.
+
+## Usage
+
+### Listing SSH Keys
+
+You can use the `ssh-keys:list` command to show all configured ssh keys. Any key added via the `dokku-installer` will be associated with the `admin` key name.
 
 ```shell
-# from your local machine
-# replace dokku.me with your domain name or the host's IP
-# replace root with your server's root user
-# USER is the username you use to refer to this particular key
-cat ~/.ssh/id_rsa.pub | ssh root@dokku.me "sudo sshcommand acl-add dokku USER"
+dokku ssh-keys:list
 ```
 
-At it's base, the `sshcommand` *must* be run under a user with sudo access, as it sets keys for the dokku user.
-
-For instance, if you stored your public key at `~/.ssh/id_rsa.pub-open` and are deploying to EC2 where the default root-enabled user is `ubuntu`, you can run the following command to add your key under the `superuser` username:
-
 ```
-cat ~/.ssh/id_rsa.pub-open | ssh ubuntu@dokku.me "sudo sshcommand acl-add dokku superuser"
+61:21:1f:88:7f:86:d4:3a:68:9f:18:aa:41:4f:bc:3d NAME="admin" SSHCOMMAND_ALLOWED_KEYS="no-agent-forwarding,no-user-rc,no-X11-forwarding,no-port-forwarding"
 ```
 
-If you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to dokku (it will use your host username as the `USER`):
+The output contains the following information:
+
+- SSH Key Fingerprint.
+- The `KEY_NAME`.
+- A comma separated list of ssh options under the `SSHCOMMAND_ALLOWED_KEYS` name.
+
+### Adding SSH Keys
+
+You can add your public key to Dokku with the `ssh-keys:add` command. The output will be the fingerprint of the ssh key:
+
+```shell
+dokku ssh-keys:add KEY_NAME path/to/id_rsa.pub
+```
 
 ```
+b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
+```
+
+`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.
+
+Admin users and root can also add keys remotely:
+
+```shell
+cat ~/.ssh/id_rsa.pub | ssh dokku@dokku.me ssh-keys:add KEY_NAME
+```
+
+If you are using an ssh user other than `dokku`, then you'll also need to specify the `dokku` bin:
+
+```shell
+cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
+```
+
+
+Finally, if you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
+
+```shell
 cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
 ```
 
+### Removing SSH Keys
+
+As key names are unique, they can be used to remove a public ssh key.
+
+```SHELL
+dokku ssh-keys:remove KEY_NAME
+```
+
 ## Scoping commands to specific users
 
-See the [user auth plugin trigger documentation](/dokku/development/plugin-triggers/#user-auth).
+Keys are given unique names, which can be used in conjunction with the [user-auth](/docs/development/plugin-triggers.md#user-auth) plugin trigger to handle command authorization. Please see the documentation on that trigger for more information.
+
+## Granting other Unix user accounts Dokku access
+
+Any Unix user account which belongs to the 'sudo' Unix group can run Dokku.  However, you may want to give them Dokku access but not full sudo privileges.
+
+To allow other Unix user accounts to be able to run Dokku commands, without giving them full sudo access, modify your sudoers configuration.
+
+Use `visudo /etc/sudoers.d/dokku-users`, or `visudo /etc/sudoers` to add the following line:
+
+```
+%dokku ALL=(ALL:ALL) NOPASSWD:SETENV: /usr/bin/dokku
+```
+

docs/deployment/zero-downtime-deploys.md

@@ -6,65 +6,122 @@
 checks <app>                             Show zero-downtime status
 checks:disable <app> [process-type(s)]   Disable zero-downtime deployment for all processes (or comma-separated process-type list) ***WARNING: this will cause downtime during deployments***
 checks:enable <app> [process-type(s)]    Enable zero-downtime deployment for all processes (or comma-separated process-type list)
+checks:report [<app>] [<flag>]           Displays a checks report for one or more apps
+checks:run <app> [process-type(s)]       Runs zero-downtime checks for all processes (or comma-separated process-type list)
 checks:skip <app> [process-type(s)]      Skip zero-downtime checks for all processes (or comma-separated process-type list)
 ```
 
-Following a deploy, dokku will wait `10` seconds before routing traffic to the new container to give your application time to boot up. If the application is not running after this time, then the deploy is failed and your old container will continue serving traffic. You can modify this value globally or on a per-application basis:
+By default, Dokku will wait `10` seconds after starting each container before assuming it is up and proceeding with the deploy. Once this has occurred for all containers started by for an application, traffic will be switched to point to your new containers. Dokku will also wait a further `60` seconds _after_ the deploy is complete before terminating old containers in order to give time for long running connections to terminate. In either case, you may have more than one container running for a given application.
+
+You may both create user-defined checks for web processes using a `CHECKS` file, as well as customize any and all parts of this experience using the checks plugin.
+
+> 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:
+
+- `DOKKU_DEFAULT_CHECKS_WAIT`: (default: `10`) If no user-defined checks are specified - or if the process being checked is not a `web` process - this is the period of time Dokku will wait before checking that a container is still running.
+- `DOKKU_DOCKER_STOP_TIMEOUT`: (default: `10`) Configurable grace period given to the `docker stop` command. If a container has not stopped by this time, a `kill -9` signal or equivalent is sent in order to force-terminate the container. Both the `ps:stop` and `apps:destroy` commands _also_ respect this value. If not specified, the docker defaults for the [docker stop command](https://docs.docker.com/engine/reference/commandline/stop/) will be used.
+- `DOKKU_WAIT_TO_RETIRE`: (default: `60`) After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running http connections.
+
+The following settings may also be specified in the `CHECKS` file, though are available as environment variables in order to ease application reuse.
+
+- `DOKKU_CHECKS_WAIT`: (default: `5`) Wait this many seconds for the container to start before running checks.
+- `DOKKU_CHECKS_TIMEOUT`: (default: `30`) Wait this many seconds for each response before marking it as a failure.
+- `DOKKU_CHECKS_ATTEMPTS`: (default: `5`) Number of retries for to run for a specific check before marking it as a failure
+
+## Skipping and Disabling Checks
+
+> Note that `checks:disable` will now (as of 0.6.0) cause downtime for that process-type during deployments. Previously, it acted as `checks:skip` currently does.
+
+You can choose to skip checks completely on a per-application/per-process basis. Skipping checks will avoid the default 10 second waiting period entirely, as well as any other user-defined checks.
 
 ```shell
-dokku config:set --global DOKKU_DEFAULT_CHECKS_WAIT=30
-dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=30
+# process type specification is optional
+dokku checks:skip node-js-app worker,web
 ```
 
-You can also choose to skip checks or disable zero-downtime completely on a per-application/per-process basis:
-
-```shell
-dokku checks:skip <app> worker,web
 ```
-
-```shell
-dokku checks:disable <app> worker,web
-```
-> Note that `checks:disable` will now (as of 0.6.0) cause downtime for that process-type during deployments.
-
-Additionally, any given process can only be configured to skip OR disable zero-downtime. example:
-
-```shell
-$ dokku checks:skip testapp worker,web
------> Skipping zero downtime for app's (testapp) proctypes (worker,web)
------> Unsetting testapp
+-----> Skipping zero downtime for app's (node-js-app) proctypes (worker,web)
+-----> Unsetting node-js-app
 -----> Unsetting DOKKU_CHECKS_DISABLED
 -----> Setting config vars
        DOKKU_CHECKS_SKIPPED: worker,web
-$ dokku checks:disable testapp worker
------> Disabling zero downtime for app's (testapp) proctypes (worker)
+```
+
+Zero-downtime checks can also be disabled completely. This will stop old containers **before** new ones start, which may result in broken connections and downtime if your application fails to boot properly.
+
+```shell
+dokku checks:disable node-js-app worker
+```
+
+```
+-----> Disabling zero downtime for app's (node-js-app) proctypes (worker)
 -----> Setting config vars
        DOKKU_CHECKS_DISABLED: worker
 -----> Setting config vars
        DOKKU_CHECKS_SKIPPED: web
 ```
 
-Dokku will wait `60` seconds before stopping the old container so that existing connections are given a chance to complete. You can modify this value globally or on a per-application basis:
+### Displaying checks reports about an app
+
+> New as of 0.8.1
+
+You can get a report about the app's checks status using the `checks:report` command:
 
 ```shell
-dokku config:set --global DOKKU_WAIT_TO_RETIRE=120
-dokku config:set <app> DOKKU_WAIT_TO_RETIRE=120
+dokku checks:report
 ```
 
-> Note that during this time, multiple containers may be running on your server, which can be an issue for memory-hungry applications on memory-constrained servers.
+```
+=====> search checks information
+       Checks disabled list: none
+       Checks skipped list: none          
+=====> python-sample checks information
+       Checks disabled list: none
+       Checks skipped list: none          
+=====> ruby-sample checks information
+       Checks disabled list: _all_
+       Checks skipped list: none          
+```
 
-## Checks
+You can run the command for a specific app also.
+
+```shell
+dokku checks:report node-js-sample
+```
+
+```
+=====> node-js-sample checks information
+       Checks disabled list: none
+       Checks skipped list: none          
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku checks:report node-js-sample --checks-disabled-list
+```
+
+## Customizing Checks
 
 If your application needs a longer period to boot up - perhaps to load data into memory, or because of slow boot time - you may also use dokku's `checks` functionality to more precisely check whether an application can serve traffic or not.
 
-Checks are run against the detected `web` process from your application's `Procfile`. For non-web processes, dokku will fallback to the aforementioned process uptime check.
+Checks are run against the detected `web` process from your application's `Procfile`. For non-web processes, Dokku will fallback to the aforementioned process uptime check.
 
 To specify checks, add a `CHECKS` file to the root of your project directory. The `CHECKS` file should be plain text and may contain:
 
-  * Check instructions
-  * Settings (NAME=VALUE)
-  * Comments (lines starting with #)
-  * Empty lines
+- Check instructions
+- Settings (NAME=VALUE)
+- Comments (lines starting with #)
+- Empty lines
 
 > For dockerfile-based deploys, the file *must* be in `/app/CHECKS` within the container. `/app` is used by default as the root container directory for buildpack-based deploys.
 
@@ -88,17 +145,19 @@ 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.
+
 ### Check Settings
 
 The default behavior is to wait for `5` seconds before running the checks, to timeout the checks after `30` seconds, and to attempt the checks `5` times. If the checks fail `5` times, the deployment is considered failed and the old container will continue serving traffic.
@@ -113,18 +172,90 @@ ATTEMPTS=10 # Attempt checks 10 times
 /  My Amazing App
 ```
 
-You can also override the default `WAIT`, `TIMEOUT`, and `ATTEMPTS` variables for the global dokku installation:
+## Manually Invoking Checks
+
+Checks can also be manually invoked via the `checks:run` command. This can be used to check the status of an application via cron to provide integration with external healthchecking software.
+
+Checks are run against a specific application:
 
 ```shell
-dokku config:set --global DOKKU_CHECKS_WAIT=30
-dokku config:set --global DOKKU_CHECKS_TIMEOUT=60
-dokku config:set --global DOKKU_CHECKS_ATTEMPTS=10
+dokku checks:run APP
 ```
 
-If your application runs multiple processes (a background worker configured in your `Procfile`, for example) and you have checks to ensure that your web application has booted up, you may want to disable the default check wait time for that application to avoid the `10` second wait per non-web process:
+```
+-----> Running pre-flight checks
+-----> Running checks for app (APP.web.1)
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+-----> Running checks for app (APP.web.2)
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+-----> Running checks for app (APP.worker.1)
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+```
+
+Checks can be scoped to a particular process type:
 
 ```shell
-dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=0
+dokku checks:run node-js-app worker
+```
+
+```
+-----> Running pre-flight checks
+-----> Running checks for app (APP.worker.1)
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+```
+
+An app process id may also be specified:
+
+```shell
+dokku checks:run node-js-app web.2
+```
+
+```
+-----> Running pre-flight checks
+-----> Running checks for app (APP.web.2)
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+```
+
+Non-existent process types will result in an error:
+
+```shell
+dokku checks:run node-js-app non-existent
+```
+
+```
+-----> Running pre-flight checks
+Invalid process type specified (APP.non-existent)
+```
+
+Non-existent process ids will *also* result in an error
+
+```shell
+dokku checks:run node-js-app web.3
+```
+
+```
+-----> Running pre-flight checks
+Invalid container id specified (APP.web.3)
 ```
 
 ## Example: Successful Rails Deployment
@@ -133,27 +264,29 @@ In this example, a Rails application is successfully deployed to dokku. The init
 
 ### CHECKS file
 
-````
+```
 WAIT=10
 ATTEMPTS=6
 /check.txt  simple_check
-````
+```
 
 For this check to work, we've added a line to `config/routes.rb` that simply returns a string:
 
-````
+```
 get '/check.txt', to: proc {[200, {}, ['simple_check']]}
-````
+```
 
 ### Deploy Output
 
 > Note: The output has been trimmed for brevity
 
-````
+```shell
 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
@@ -163,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:
@@ -182,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
@@ -190,16 +323,16 @@ 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
 
@@ -209,11 +342,11 @@ Once the attempts have been exceeded, the deployment fails and we see the contai
 
 ### CHECKS file
 
-````
+```
 WAIT=10
 ATTEMPTS=6
 /
-````
+```
 
 > The check to the root url '/' would normally access the database.
 
@@ -221,11 +354,13 @@ ATTEMPTS=6
 
 > Note: The output has been trimmed for brevity
 
-````
+```shell
 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
@@ -235,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:
@@ -275,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
@@ -296,16 +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'
-````
-
-### Configuring docker stop timeout
-
-[By default](https://docs.docker.com/engine/reference/commandline/stop/), docker will wait 10 seconds from the time the `stop` command is passed to a container before it attempts to kill said container. This timeout can be configured on a per-app basis in dokku by setting the `DOKKU_DOCKER_STOP_TIMEOUT` configuration variable. This timeout applies to normal zero-downtime deployments as well as the `ps:stop` and `apps:destroy` commands.
-```
-$ dokku config:set $APP DOKKU_DOCKER_STOP_TIMEOUT=20
+error: failed to push some refs to 'dokku@dokku.me:myapp'
 ```

docs/development/plugin-creation.md

@@ -1,14 +1,33 @@
 # Plugin Creation
 
+Plugins can simply be implementations of [triggers](/docs/development/plugin-triggers.md) or they may implement a command structure of their own. Dokku has no restrictions on the language in which a plugin is implemented, it only cares that the plugin implements the appropriate [commands](/docs/development/plugin-creation.md#command-api) or [triggers](/docs/development/plugin-triggers.md) API. NOTE: all files that implement the triggers or commands API must be executable.
+
 If you create your own plugin:
 
-1. Take a look at the plugins shipped with dokku and hack away!
-2. Check out the [list of triggers](/dokku/development/plugin-triggers) your plugin can implement.
+1. Take a look at the plugins shipped with Dokku and hack away!
+2. Check out the [list of triggers](/docs/development/plugin-triggers.md) your plugin can implement.
 3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](/dokku/plugins) and add a link to it.
+4. Edit [this page](/docs/community/plugins.md) and add a link to it.
 5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
 
 
+### Compilable Plugins (i.e. golang, java(?), c, etc.)
+The plugin developer is required to implement the `install` trigger such that it will output your built executable(s) in the correct directory structure to implement the plugin's desired command and/or trigger API. See [smoke-test-plugin](https://github.com/dokku/smoke-test-plugin) for an example.
+
+
+### Command API
+There are 3 main implementation points: `commands`, `subcommands/default`, and `subcommands/<command-name>`
+
+#### commands
+Primarily used to supply the plugin's usage/help output. (i.e. [plugin help](https://github.com/dokku/dokku/tree/master/plugins/plugin/commands))
+
+#### subcommands/default
+Implements the plugin's default command behavior. (i.e. [`dokku plugin`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/default))
+
+#### subcommands/<command-name>
+Implements the additional command interface and will translate to `dokku plugin:cmd` on the command line. (i.e. [`dokku plugin:install`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/install))
+
+
 ### Sample plugin
 The below plugin is a dummy `dokku hello` plugin.
 
@@ -30,7 +49,7 @@ hello_main_cmd() {
   set -- $cmd $@
   ##
 
-  [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$2"
   local APP="$2";
 
@@ -58,7 +77,7 @@ hello_world_cmd() {
   set -- $cmd $@
   ##
 
-  [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$2"
   local APP="$2";
 
@@ -110,7 +129,7 @@ esac
 
 Each plugin requires a `plugin.toml` descriptor file with the following required fields:
 
-```shell
+```toml
 [plugin]
 description = "dokku hello plugin"
 version = "0.1.0"
@@ -119,11 +138,12 @@ version = "0.1.0"
 
 A few notes:
 
+- Don't forget to `chmod +x` your executable files.
 - You should always support `DOKKU_TRACE` as specified on the 2nd line of the plugin.
 - If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
 - A `help` command is required, though it is allowed to be empty. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.
 - Commands *should* be namespaced.
-- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows dokku to output a `command not found` message.
+- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
 - Be sure you want the "set -eo pipefail" option. Look at the following example :
 
     ```shell
@@ -133,7 +153,7 @@ A few notes:
     fi
     ```
 
-  In the case where the "user/repo" is not installed, dokku exits just before the awk command,
+  In the case where the "user/repo" is not installed, Dokku exits just before the awk command,
   you will never see the message printed with echo. You just want "set -e" in this case.
 
   Here is the documentation of the 'set -eo pipefail' option:
@@ -149,10 +169,10 @@ A few notes:
 - As some plugins require access to set app config settings and do not want/require the default Heroku-style behavior of a restart, we have the following "internal" commands that provide this functionality :
 
   ```shell
-  dokku config:set --no-restart APP KEY1=VALUE1 [KEY2=VALUE2 ...]
-  dokku config:unset --no-restart APP KEY1 [KEY2 ...]
+  dokku config:set --no-restart node-js-app KEY1=VALUE1 [KEY2=VALUE2 ...]
+  dokku config:unset --no-restart node-js-app KEY1 [KEY2 ...]
   ```
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
-- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/dokku/development/plugin-triggers) doc for examples.
+- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/docs/development/plugin-triggers.md) doc for examples.
 - As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
-- As of 0.6.0, we advise you to *not* call the dokku binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call dokku internal functions
+- As of 0.6.0, we advise you to *not* call the `dokku` binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions

docs/development/release-process.md

@@ -4,59 +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 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 Packages
-
-The `build` target in the dokku `Vagrantfile` creates debian 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
-```
-
-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.
@@ -66,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.6.4-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'
@@ -75,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/development/testing.md

@@ -1,36 +1,48 @@
 # Dokku test suite
 
-Dokku now has a full test suite to assist in quick iterating development. These tests include a linter using [shellcheck](https://github.com/koalaman/shellcheck), functional unit tests using the [bats testing framework](https://github.com/sstephenson/bats), and a deployment suite of example apps that use the most popular languages and frameworks.
+Dokku has a full test suite to assist in quick iterating development. These tests include a linter using [shellcheck](https://github.com/koalaman/shellcheck), functional unit tests using the [bats testing framework](https://github.com/sstephenson/bats), and a deployment suite of example apps that use the most popular languages and frameworks.
 
-Bats tests can be found here:
-  ```
-  tests/unit/*.bats
-  ```
+We maintain the Dokku test harness within the `tests` directory:
 
-Example apps can be found here:
-  ```
-  tests/apps/
-  ```
+- `tests/unit/*.bats`: Bats tests
+- `tests/apps/`: Example applications that can be used for tests
 
-### Executing tests locally
+## Continuous Integration
 
-- Setup dokku in a [vagrant vm](/dokku/getting-started/install/vagrant)
-- Test setup and execution
+All pull requests have tests run against them on [CircleCI](https://circleci.com/), a continuous integration platform that provides Docker support for Ubuntu Trusty 14.04.
+
+If you wish to skip tests for a particular commit - e.g. Documentation changes - you may add the `[ci skip]` designator to your commit message. Commits that *should* be tested but have the above designator will not be merged.
+
+While we do provide official packages for a variety of platforms, as our test suite currently runs on Ubuntu Trusty 14.04, we only provide official installation support for that platform.
+
+## Local Test Execution
+
+- Setup Dokku in a [vagrant vm](/docs/getting-started/install/vagrant.md)
+- Run the following to setup tests and execute them:
 
   ```shell
-  $ vagrant ssh
-  $ sudo su -
-  $ cd ~/dokku
-  $ make ci-dependencies setup-deploy-tests
-  $ make test  # execute the entire test suite (linter, bats tests, and app deployment tests)
-  $
-  $ make lint copyfiles # run linter & update vagrant dokku install from local git clone
-  $ make unit-tests  # execute all bats tests
-  $ make deploy-tests  # execute all app deployment tests
-  ```
-- Additionally you may run a specific app deployment tests with a target similar to:
+  vagrant ssh
+  sudo su -
+  cd ~/dokku
+  make ci-dependencies setup-deploy-tests
 
-  ```shell
-  $ make deploy-test-nodejs-express
+  # execute the entire test suite (linter, bats tests, and app deployment tests)
+  make test
+
+  # run linter & update vagrant Dokku install from local git clone
+  make lint copyfiles
+
+  # execute all bats tests
+  make unit-tests
+
+  # execute all app deployment tests
+  make deploy-tests
   ```
-- For a full list of test make targets check out `tests.mk` in the root of the dokku repository.
+
+Additionally you may run a specific app deployment tests with a target similar to:
+
+```shell
+make deploy-test-nodejs-express
+```
+
+For a full list of test make targets check out `tests.mk` in the root of the Dokku repository.

docs/docker-options.md

@@ -1,77 +0,0 @@
-# Docker Container Options
-
-> New as of 0.3.17
-
-Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
-
-```
-docker-options <app> [phase(s)]                  Display app's Docker options for all phases (or comma separated phase list)
-docker-options:add <app> <phase(s)> OPTION       Add Docker option to app for phase (comma-separated phase list)
-docker-options:remove <app> <phase(s)> OPTION    Remove Docker option from app for phase (comma-separated phase list)
-```
-
-> When specifying multiple phases, they **must** be comma-separated _without_ spaces in between each phase, like so:
->
-> ```
-> dokku docker-options:add myapp deploy,run "-v /home/dokku/logs/myapp:/app/logs"
-> ```
-
-## About Dokku phases
-
-Dokku deploys your application in multiple "phases" and the `docker-options` plugin allows you to pass arguments to their underlying docker container:
-
-- `build`: the container that executes the appropriate buildpack
-- `deploy`: the container that executes your running/deployed application
-- `run`: the container that executes any arbitrary command via `dokku run myapp`
-
-## Examples
-
-### Add Docker options
-
-Add some options for the deployed/running app and when executing [`dokku run`](deployment/one-off-processes/):
-
-```shell
-# Mount a host volume in a Docker container: "-v /host/path:/container/path"
-dokku docker-options:add myapp deploy "-v /home/dokku/logs/myapp:/app/logs"
-dokku docker-options:add myapp run "-v /home/dokku/logs/myapp:/app/logs"
-```
-
-> Note: When [mounting a host directory](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) in a Dokku app you should first create that directory as user `dokku` and then mount the directory under `/app` in the container using `docker-options` as above. Otherwise the app will lack write permission in the directory.
-
-### Output Docker options
-
-```shell
-dokku docker-options myapp
-# Deploy options:
-#    -v /home/dokku/logs/myapp:/app/logs
-# Run options:
-#    -v /home/dokku/logs/myapp:/app/logs
-```
-
-### Remove a Docker option
-
-```shell
-dokku docker-options:remove myapp run "-v /home/dokku/logs/myapp:/app/logs"
-```
-
-## Advanced usage
-
-In your applications folder `/home/dokku/app_name` create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).
-
-Inside this file list one Docker option per line. For example:
-
-```shell
---link container_name:alias
--v /host/path:/container/path
--v /another/container/path
-```
-
-The above example will result in the following options being passed to Docker during `dokku run`:
-
-```shell
---link container_name:alias -v /host/path:/container/path -v /another/container/path
-```
-
-You may also include comments (lines beginning with a #) and blank lines in the DOCKER_OPTIONS file.
-
-Move information on Docker options can be found here: http://docs.docker.io/en/latest/reference/run/ .