Release 0.14.4

# History

## 0.14.4

Install/update via the bootstrap script:

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

### Bug Fixes

- #3415: @josegonzalez Drop universe installation in debian

.circleci/config.yml

@@ -0,0 +1,34 @@
+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 go-tests ci-go-coverage ;;
+            1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
+            2) sudo -E make -e deploy-test-multi ;;
+            3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
+          esac
+      - run:
+          shell: /bin/bash
+          command: sudo -E make -e test-ci
+          no_output_timeout: 60m
+      - store_artifacts:
+          path: ./coverage.out
+      - store_artifacts:
+          path: ./test-results
+          destination: test-results
+      - store_test_results:
+          path: test-results

.codacy.yml

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

.dockerignore

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

.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,13 @@
-.vagrant
+*.deb
+*.rpm
 .DS_Store
+.ruby-version
+.idea/
+.vagrant
+build/
+data/
+test-results/
 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,7 +11,7 @@ several ways to help out:
 * Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
 * Come up with new ways to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
 * Blog about different ways you are using dokku
-* [Sponsor](https://opencollective.com/dokku#support) the Dokku project financially 
+* Sponsor the Dokku project financially on [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku)
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -44,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)
@@ -55,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`.
@@ -74,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).
@@ -122,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,963 @@
 # History
 
+## 0.14.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.4/bootstrap.sh
+sudo DOKKU_TAG=v0.14.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3415: @josegonzalez Drop universe installation in debian
+
+## 0.14.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.3/bootstrap.sh
+sudo DOKKU_TAG=v0.14.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3412: @josegonzalez Ensure official golang plugins have correct help output
+- #3411: @josegonzalez Properly handle the nginx installation dependency
+- #3406: @josegonzalez Add missing semicolons to app-json script
+- #3394: @josegonzalez Quiet ps:retire where possible
+
+### New Features
+
+- #3410: @josegonzalez Make installs quieter
+- #3409: @josegonzalez Build golang binaries with higher concurrency
+- #3408: @josegonzalez Disable container restarts for stopped containers
+- #3389: @heyarne Remove jQuery from web-based installer
+
+### Documentation
+
+- #3407: @tkrugg Fix typo on domain docs
+
+### Tests
+
+- #3414: @josegonzalez Test and release changes
+
+## 0.14.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh
+sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3395: @josegonzalez Correct early exit 1 in apps:report
+
+### Documentation
+
+- #3393: @jayjun Fix capitalization and formatting in installation guides
+- #3392: @jayjun Fix wrong PostgreSQL environment variable in guide
+- #3391: @josegonzalez Update all gpgkey paths to the new url
+
+## 0.14.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.1/bootstrap.sh
+sudo DOKKU_TAG=v0.14.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3386: @josegonzalez Ensure we can deploy code when there is no pre or post-deploy script defined
+
+## 0.14.0
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.0/bootstrap.sh
+sudo DOKKU_TAG=v0.14.0 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3384: @josegonzalez fix: use updated gpg key for apt repository
+- #3382: @josegonzalez Set cleanup to global when no application is specified
+- #3350: @josegonzalez Do not build the proxy config when there are no app listeners
+- #3366: @josegonzalez Add post-app-clone-setup to network clean make target
+- #3349: @josegonzalez Ensure apps are cleanly cloned
+- #3356: @josegonzalez Move storage directory into DOKKU_LIB_ROOT
+- #3341: @baikunz Select only default dokku network IP
+- #3348: @josegonzalez Use correct name for packagecloud token when running CI commands
+- #3339: @josegonzalez Properly check args when calling cleanup globally
+- #3344: @josegonzalez Allow running dokku report without needing an interactive shell
+
+### New Features
+
+- #3381: @josegonzalez Add support for the Procfile release command
+- #3380: @josegonzalez Install stable docker when using bootstrap script
+- #3378: @josegonzalez Make admin setup UI look nicer
+- #3369: @josegonzalez Pull invalid nginx configuration when the nginx configs fail to validate
+- #3371: @josegonzalez Add tests section to changelog
+- #3358: @josegonzalez Image tag deploy workflow cleanup
+- #3351: @josegonzalez Do not clone URLS and VHOST files to new apps
+- #3357: @josegonzalez Add support for building arbitrary releases
+- #3354: @josegonzalez Drop default dhparam key size to 2048
+- #3347: @josegonzalez Upgrade herokuish
+- #3352: @josegonzalez Increase security of default SSL setup
+- #3353: @josegonzalez Normalize tests
+- #3345: @josegonzalez Allow triggering the full report for all apps via --all flag
+- #3346: @josegonzalez Always overwrite the dokku.conf file for nginx
+
+### Documentation
+
+- #3377: @josegonzalez Remove team member section on homepage in favor of sponsor section
+- #3376: @josegonzalez Switch from rawgit to jsdelivr
+- #3365: @josegonzalez Remove extra tags:create call from docs
+
+### Tests
+
+- #3379: @josegonzalez Run mvdan/shfmt on test runs
+- #3370: @josegonzalez Add junit support to shellcheck output
+- #3308: @josegonzalez Add timing info to test runs on CircleCI
+- #3367: @josegonzalez Run tests from built artifact
+- #3368: @josegonzalez Balance circleci tests
+- #3363: @josegonzalez Add a wrapper for invoking a single test
+- #3362: @josegonzalez Allow tests to be run from any directory
+- #3360: @josegonzalez Switch to bats-core
+- #3361: @josegonzalez Do not generate dhparam for tests
+
+### Other
+
+- #3279: @fruitl00p Make sure the universe repo is loaded into APT
+
+## 0.13.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.4/bootstrap.sh
+sudo DOKKU_TAG=v0.13.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3337: @josegonzalez Use correct container id variable for killing containers
+
+### New Features
+
+- #3338: @josegonzalez Redirect ps:retire output to a log file
+
+## 0.13.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.3/bootstrap.sh
+sudo DOKKU_TAG=v0.13.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3330: @josegonzalez Ensure chowned properties always have a user and group set
+
+### New Features
+
+- #3334: @josegonzalez refactor: run every 5 minutes instead of 2
+
+## 0.13.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.2/bootstrap.sh
+sudo DOKKU_TAG=v0.13.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3329: @josegonzalez Avoid parsing missing file when retiring containers
+- #3325: @wcalandro Add "--global" to dokku cleanup on dokku update
+
+### Documentation
+
+- #3326: @josegonzalez Add note to release on how to upgrade via the bootstrap script
+
+## 0.13.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.1/bootstrap.sh
+sudo DOKKU_TAG=v0.13.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3324: @josegonzalez Add missing source of config functions
+
+## 0.13.0
+
+### Bug Fixes
+
+- #3312: @josegonzalez fix: keep track of failed containers regardless of docker kill output
+- #3299: @josegonzalez Wrap script_bin in double-quotes
+- #3295: @alexquick Sort config:show by key name
+- #3288: @josegonzalez Wrap script binary in single quotes during executable check
+
+### New Features
+
+- #3302: @josegonzalez Add ability to check on app lock status via apps:locked command
+- #3315: @aokon Upgrade herokuish to 0.4.5 version
+- #3236: @josegonzalez Retire old containers
+- #3307: @josegonzalez Add support for docker.io package
+- #3301: @josegonzalez Add ability to sync packages to a new version of ubuntu
+- #3286: @josegonzalez Sanitize docker inspect output with ps:inspect
+- #3240: @josegonzalez Refactor Procfile handling to use go-procfile-util
+- #3282: @josegonzalez Use create instead of run for faster and more reliable file copy from docker images
+- #3280: @josegonzalez Better scheduler support
+- #3259: @josegonzalez Check if script is executable when a full path is specified
+
+### Documentation
+
+- #3314: @royklutman Remove reference to non-existent DigitalOcean hosting plan
+- #3313: @morenoh149 Indicate to user to specify hostname
+- #3310: @josegonzalez Add a note to our issue template begging for money
+- #3281: @josegonzalez Add documentation on custom error pages
+
+## 0.12.13
+
+### New Features
+
+- #3257: @josegonzalez Suppress output in git plugin during builds
+- #3254: @michaelshobbs Update herokuish to 0.4.4
+
+### Documentation
+
+- #3270: @alexymik Correct typo in git documentation
+- #3268: @josegonzalez Correct notice on ubuntu support
+- #3247: @mimischi Fix typo in ps:stopall
+- #3246: @dv Change DISABLE_CHOWN to disable-chown
+
+## 0.12.12
+
+### New Features
+
+- #3244: @josegonzalez Allow disabling chown for persistent storage in scheduler-docker-local
+
+## 0.12.11
+
+### Bug Fixes
+
+- #3238: @josegonzalez Handle proxy issues in app renaming
+- #3234: @mashrikt Unset GIT_QUARANTINE_PATH when updating repo submodule
+- #3223: @josegonzalez Get the global scheduler if no app is specified
+- #3218: @wcalandro Fix error text when using "dokku plugin:uninstall"
+
+### New Features
+
+- #3242: @josegonzalez Upgrade herokuish to 0.4.3
+- #3241: @josegonzalez Add a subcommand for retrieving failed app deploy logs
+- #3237: @josegonzalez Support --quiet header when showing all environment variables
+
+### Documentation
+
+- #3235: @josegonzalez Switch from ps:rebuild to ps:restart
+- #3221: @josegonzalez Better callout for why env vars do not get applied to dockerfile builds
+
+## 0.12.10
+
+### New Features
+
+- #3214: @josegonzalez Add net-tools as a dependency to debian installs
+
+## 0.12.9
+
+### Bug Fixes
+
+- #3212: @josegonzalez Add missing config source
+
+## 0.12.8
+
+### Bug Fixes
+
+- #3211: @josegonzalez Add missing source of config/functions
+
+### Documentation
+
+- #3204: @znz Add `--no-restart` to `config:unset` of `config:help`
+- #3203: @josegonzalez Clarify issue template
+
+## 0.12.7
+
+### Bug Fixes
+
+- #3200: @josegonzalez fix: correct bash-completion integration
+
+### New Features
+
+- #3199: @josegonzalez Update herokuish to 0.4.2
+- #3198: @josegonzalez Cleanup temporary changes during betafish releases
+
+## 0.12.6
+
+### Bug Fixes
+
+- #3193: @josegonzalez Install bash-completion files correctly
+- #3179: @josegonzalez Ignore issues with popd when OS versions with stricter security
+- #3177: @philm ensure dokku-redeploy runs when docker is stopped then started
+- #3176: @josegonzalez Detect mixed running status on service start
+
+### New Features
+
+- #3195: @josegonzalez Allow lower versions of docker-engine
+- #3181: @malixsys Adding support for `http2_push_preload` to nginx 1.13.9+ configuration
+- #3183: @josegonzalez Unskip initial herokuish test
+- #3175: @josegonzalez Implement bash-completion for commands
+
+### Documentation
+
+- #3197: @josegonzalez Add a tutorial for deploying applications via gitlab ci
+- #3194: @josegonzalez Clarify why dokku report information is useful
+- #3189: @josegonzalez Correct issue with adding a user remotely
+
+## 0.12.5
+
+### Bug Fixes
+
+- #3173: @josegonzalez fix: do not output error message twice
+
+### New Features
+
+- #3172: @josegonzalez feat: Add the ability to ignore existing applications during a git clone
+- #3171: @josegonzalez Allow users to override the reported app url
+- #3170: @josegonzalez Add ps:startall command
+
+### Documentation
+
+- #3159: @zuck Improve docs for default site with HTTPS
+
+## 0.12.4
+
+### Bug Fixes
+
+- #3168: @josegonzalez Use correct variable name when writing deploy-branch value
+
+## 0.12.3
+
+### Bug Fixes
+
+- #3156: @josegonzalez fix: ensure we _always_ include all types in history output
+
+### Documentation
+
+- #3163: @josegonzalez Better apt install formatting
+
+### Other
+
+- #3153: @scjody Allow specifying a separate DOKKU_HOST_ROOT
+
+## 0.12.2
+
+### Bug Fixes
+
+- #3155: @josegonzalez fix: re-add is_container_running
+
+## 0.12.1
+
+### Bug Fixes
+
+- #3151: @josegonzalez fix: include missing config/functions source
+
+## 0.12.0
+
+### Bug Fixes
+
+- #3146: @josegonzalez Fix non ubuntu installs
+- #3138: @josegonzalez Use correct path for /etc/default file
+- #3137: @josegonzalez Ensure we can disable setting the rev-env-var
+- #3131: @axilleas Capitalize log sentence when renaming containers
+- #3128: @Modicrumb Improve windows vagrant experience
+- #3105: @znz Follow renaming from deploy-method to deploy-source
+- #3101: @josegonzalez Handle stopped nginx during debian installation
+
+### New Features
+
+- #3141: @josegonzalez Centralize app existence checks into the apps plugin
+- #3147: @josegonzalez Create proxy:ports-set call
+- #3145: @josegonzalez Add report trigger
+- #3144: @josegonzalez Increase curl max timeout to 600 seconds (10 minutes)
+- #3107: @znz Remove unused password in ssl cert generation
+- #3095: @josegonzalez Migrate env for NGINX_* to PROXY_*
+- #3140: @josegonzalez Add newline to config:get output
+- #3139: @josegonzalez Add ability to initialize a git repository out of band
+- #3111: @josegonzalez Upgrade herokuish to 0.4.0
+- #3110: @josegonzalez Upgrade herokuish to 0.3.36
+- #3106: @znz Remove unnecessary shellcheck disable
+- #3098: @josegonzalez Pull herokuish from docker hub when installing via package
+- #3100: @josegonzalez Properly handle invalid process type entries during DOKKU_SCALE generation
+- #3097: @josegonzalez Update herokuish to 0.3.35
+
+### Documentation
+
+- #3148: @josegonzalez Use consistent terms for domains, apps, and commands
+- #3135: @josegonzalez Revert "Clarify that the checks plugin only matches content start"
+- #3134: @tomdyson Fix typo in upgrading docs
+- #3119: @TomasHubelbauer Link through to the application deployment page after the installation
+- #3118: @Tyilo Clarify that the checks plugin only matches content start
+- #3113: @ilyapoz Fix proxy management link
+- #3112: @josegonzalez Minor doc css fixes
+- #3104: @sarendsen Add dokku-limit to plugins documentation
+- #3108: @znz Update plugin list output
+
+## 0.11.6
+
+### Bug Fixes
+
+- #3091: @josegonzalez Properly trigger tar-based deploys on git-deployed repositories
+- #3076: @Kjwon15 Prune worktree after build
+- #3090: @josegonzalez Ensure all plugin triggers have docs and events integration
+- #3089: @josegonzalez Use a longer password for self-signed certificates
+
+### New Features
+
+- #2950: @adelq Add configuration option to disable automatic app creation
+- #3093: @josegonzalez Add subcommands to allow app locking and unlocking
+- #3092: @josegonzalez Add support for configuring the app shell
+
+### Documentation
+
+- #3096: @josegonzalez docs: Document how to check on a running dokku-installer
+
+## 0.11.5
+
+### Bug Fixes
+
+- #3088: @josegonzalez Silence port retrieval stderr
+- #3086: @josegonzalez Fix help output for golang plugins
+- #3079: @josegonzalez Move container status exclusively to ps plugin
+
+### New Features
+
+- #3085: @josegonzalez Add support for checking if an application exists
+- #3032: @josegonzalez Add support for arbitrary ubuntu versions
+- #3074: @josegonzalez Add the ability to disable ANSI prefixes via DOKKU_DISABLE_ANSI_PREFIX_REMOVAL
+- #3083: @josegonzalez Source /etc/defaults/dokku if available
+
+### Documentation
+
+- #2958: @silverfix Add tutorial for running Dokku on an external volume
+- #3082: @josegonzalez Switch from Gratipay to Patreon
+- #3081: @josegonzalez Add docs for switching between deployment methodologies
+
+## 0.11.4
+
+### Bug Fixes
+
+- #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:
@@ -896,7 +1854,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
 
@@ -1042,7 +2000,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,18 +1,37 @@
-Description of problem:
+> If you're using Dokku - especially for commercial purposes - consider donating to project development via [OpenCollective](https://opencollective.com/dokku) or [Patreon](https://www.patreon.com/dokku). Funds go to general development, support, and infrastructure costs.
+>
+> If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
 
+## Description of problem
 
-Output of the following commands
+### How reproducible
 
-- `uname -a`:
-- `free -m`:
-- `docker version`:
-- `docker -D info`:
-- `sigil -v`:
-- `docker run -ti gliderlabs/herokuish:latest herokuish version`:
-- `dokku version`:
-- `dokku plugin`:
-- `docker inspect CONTAINER_ID` (if applicable):
-  (BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+### Steps to Reproduce
+
+1.
+2.
+3.
+
+#### Actual Results
+
+#### Expected Results
+
+## Environment Information
+
+### `dokku report APP_NAME` output
+
+> This is required! Issues missing this information may be closed.
+>
+> For problems affecting all applications, the report output for a broken application is useful for our debugging.
+> You may also run `dokku report` without any arguments to display the top-level reporting information.
+
+### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?:
+
+### Additional information
+
+- Container Inspect Output (if applicable):
+  - 0.13.0+: `dokku inspect APP_NAME`
+  - <0.13.0: `docker inspect CONTAINER_ID`: WARNING, `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX.
 - `cat /home/dokku/<app>/nginx.conf` (if applicable):
 - Link to the exact repository being deployed (if possible/applicable):
 - If a deploy is failing or behaving unexpectedly:
@@ -21,25 +40,5 @@ 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 reproducible:
-
-
-Steps to Reproduce:
-1.
-2.
-3.
-
-Actual Results:
-
-
-Expected Results:
-
-
-Additional info:

Makefile

@@ -1,13 +1,16 @@
-DOKKU_VERSION = master
+DOKKU_VERSION ?= master
 
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.5.0/sshcommand
-PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
+PROCFILE_VERSION ?= 0.4.0
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand
+PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v${PROCFILE_VERSION}/procfile-util_${PROCFILE_VERSION}_linux_x86_64.tgz
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
 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 +26,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 procfile-util 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,56 +40,88 @@ 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
+plugin-dependencies: plugn procfile-util
 	sudo -E dokku plugin:install-dependencies --core
 
-plugins: plugn docker
+plugins: plugn procfile-util docker
 	sudo -E dokku plugin:install --core
 
-dependencies: apt-update sshcommand plugn docker help2man man-db sigil
+dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil
 	$(MAKE) -e stack
 
 apt-update:
-	apt-get update
+	apt-get update -qq
 
 help2man:
 	apt-get install -qq -y help2man
@@ -96,6 +134,10 @@ sshcommand:
 	chmod +x /usr/local/bin/sshcommand
 	sshcommand create dokku /usr/local/bin/dokku
 
+procfile-util:
+	wget -qO /tmp/procfile-util_latest.tgz ${PROCFILE_UTIL_URL}
+	tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin
+
 plugn:
 	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
 	tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
@@ -104,7 +146,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 +158,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,39 +1,16 @@
-# 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/)
+# Dokku
+[![Build Status](https://img.shields.io/circleci/project/github/dokku/dokku.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master)
+[![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku)
+[![Arch Package](https://img.shields.io/badge/package-arch-brightgreen.svg?style=flat-square "Arch Package")](https://aur.archlinux.org/packages/dokku/)
+[![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku)
+[![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.7.0/bootstrap.sh
-    sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh
-
-### Upgrading
-
-[View the docs for upgrading](http://dokku.viewdocs.io/dokku/getting-started/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/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.
-
 ## Sponsors
 
 See our list of past sponsors in the [SPONSORS](https://github.com/dokku/dokku/blob/master/SPONSORS.md) file.
@@ -107,6 +84,46 @@ 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 x64 - Any currently supported release
+- 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.14.4/bootstrap.sh
+sudo DOKKU_TAG=v0.14.4 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

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 # A script to bootstrap dokku.
 # It expects to be run on Ubuntu 14.04 via 'sudo'
@@ -14,12 +15,8 @@ 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 || {
+  hostname -f >/dev/null 2>&1 || {
     echo "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
     exit 1
   }
@@ -33,28 +30,49 @@ 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)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+      ;;
+    ubuntu)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+
+      add-apt-repository universe >/dev/null
+      apt-get update -qq >/dev/null
+      ;;
+  esac
 }
 
 install-dokku() {
   if [[ -n $DOKKU_BRANCH ]]; then
     install-dokku-from-source "origin/$DOKKU_BRANCH"
   elif [[ -n $DOKKU_TAG ]]; then
-    local DOKKU_SEMVER="${DOKKU_TAG//v}"
+    local DOKKU_SEMVER="${DOKKU_TAG//v/}"
     major=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[1]}')
     minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}')
     patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}')
 
+    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 +86,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,36 +107,89 @@ 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 "
   fi
 
   echo "--> Initial apt-get update"
-  apt-get update -qq > /dev/null
+  apt-get update -qq >/dev/null
   apt-get -qq -y install apt-transport-https
 
-  echo "--> Installing docker"
-  if uname -r | grep -q linode; then
-    echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
-    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
-    echo "    Installation will continue in 10 seconds."
-    sleep 10
+  if ! command -v docker &>/dev/null; then
+    echo "--> Installing docker"
+    if uname -r | grep -q linode; then
+      echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
+      echo "    You can safely ignore this warning."
+      echo "    Installation will continue in 10 seconds."
+      sleep 10
+    fi
+    export CHANNEL=stable
+    wget -nv -O - https://get.docker.com/ | sh
+  fi
+
+  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
-  wget -nv -O - https://get.docker.com/ | sh
 
   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
-  apt-get update -qq > /dev/null
+  wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+  echo "deb https://packagecloud.io/dokku/dokku/$DOKKU_DISTRO/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
+  apt-get update -qq >/dev/null
 
-  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $VHOST_ENABLE"         | sudo debconf-set-selections
-  [[ -n $DOKKU_WEB_CONFIG ]]    && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG"       | sudo debconf-set-selections
-  [[ -n $DOKKU_HOSTNAME ]]      && echo "dokku dokku/hostname string $DOKKU_HOSTNAME"            | sudo debconf-set-selections
+  [[ -n $DOKKU_VHOST_ENABLE ]] && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | sudo debconf-set-selections
+  [[ -n $DOKKU_WEB_CONFIG ]] && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG" | sudo debconf-set-selections
+  [[ -n $DOKKU_HOSTNAME ]] && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | sudo debconf-set-selections
   [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
-  [[ -n $DOKKU_KEY_FILE ]]      && echo "dokku dokku/key_file string $DOKKU_KEY_FILE"            | sudo debconf-set-selections
+  [[ -n $DOKKU_KEY_FILE ]] && echo "dokku dokku/key_file string $DOKKU_KEY_FILE" | sudo debconf-set-selections
+  [[ -n $DOKKU_NGINX_ENABLE ]] && echo "dokku dokku/nginx_enable string $DOKKU_NGINX_ENABLE" | sudo debconf-set-selections
 
   if [[ -n $DOKKU_CHECKOUT ]]; then
     # shellcheck disable=SC2086
@@ -124,7 +200,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/bash-completion

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

contrib/build-base.Dockerfile

@@ -0,0 +1,6 @@
+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

contrib/build-dokku-update.Dockerfile

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

contrib/build-dokku.Dockerfile

@@ -0,0 +1,42 @@
+FROM dokku/build-base:0.0.1
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
+RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+
+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-dokku deb-plugn deb-sshcommand deb-sigil \
+            rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil
+
+RUN ls -lha /tmp/

contrib/build-herokuish.Dockerfile

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

contrib/copy-packages

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

contrib/dokku-installer.py

@@ -3,13 +3,14 @@
 import cgi
 import json
 import os
+import re
 import SimpleHTTPServer
 import SocketServer
 import subprocess
 import sys
 import threading
 
-VERSION = 'v0.7.0'
+VERSION = 'v0.14.4'
 
 hostname = ''
 try:
@@ -20,7 +21,13 @@ try:
 except subprocess.CalledProcessError:
     pass
 
-key_file = os.getenv('KEY_FILE', '/root/.ssh/authorized_keys')
+key_file = os.getenv('KEY_FILE', None)
+if os.path.isfile('/home/ec2-user/.ssh/authorized_keys'):
+    key_file = '/home/ec2-user/.ssh/authorized_keys'
+elif os.path.isfile('/home/ubuntu/.ssh/authorized_keys'):
+    key_file = '/home/ubuntu/.ssh/authorized_keys'
+else:
+    key_file = '/root/.ssh/authorized_keys'
 
 admin_keys = []
 if os.path.isfile(key_file):
@@ -71,6 +78,7 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_GET(self):
         content = PAGE.replace('{VERSION}', VERSION)
         content = content.replace('{HOSTNAME}', hostname)
+        content = content.replace('{AUTHORIZED_KEYS_LOCATION}', key_file)
         content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
         self.send_response(200)
         self.end_headers()
@@ -100,13 +108,26 @@ 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()
             proc.wait()
 
+        set_debconf_selection('boolean', 'nginx_enable', 'true')
         set_debconf_selection('boolean', 'skip_key_file', 'true')
         set_debconf_selection('boolean', 'vhost_enable', vhost_enable)
         set_debconf_selection('boolean', 'web_config', 'false')
@@ -119,6 +140,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 +199,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:
@@ -174,70 +218,147 @@ def main():
 PAGE = """
 <html>
 <head>
+  <meta charset="utf-8" />
   <title>Dokku Setup</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+  <style>
+    .bd-callout {
+      padding: 1.25rem;
+      margin-top: 1.25rem;
+      margin-bottom: 1.25rem;
+      border: 1px solid #eee;
+      border-left-width: .25rem;
+      border-radius: .25rem;
+    }
+    .bd-callout p:last-child {
+      margin-bottom: 0;
+    }
+    .bd-callout-info {
+      border-left-color: #5bc0de;
+    }
+    pre {
+      font-size: 80%;
+      margin-bottom: 0;
+    }
+    h1 small {
+      font-size: 50%;
+    }
+    h5 {
+      font-size: 1rem;
+    }
+    .container {
+      width: 640px;
+    }
+    .result {
+      padding-left: 20px;
+    }
+    input.form-control, textarea.form-control {
+      background-color: #fafbfc;
+      font-size: 14px;
+    }
+    input.form-control::placeholder, textarea.form-control::placeholder {
+      color:  #adb2b8
+    }
+  </style>
 </head>
 <body>
-  <div class="container" style="width: 640px;">
-  <form id="form" role="form">
-    <h1>Dokku Setup <small>{VERSION}</small></h1>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
-      <label for="key">Public Key</label><br />
-      <textarea class="form-control" name="keys" rows="7" id="key">{ADMIN_KEYS}</textarea>
-    </div>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
-      <div class="form-group">
-        <label for="hostname">Hostname</label>
-        <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" />
+  <div class="container">
+    <form id="form" role="form">
+      <h1 class="pt-3">Dokku Setup <small class="text-muted">{VERSION}</small></h1>
+      <div class="alert alert-warning small" role="alert">
+        <strong>Warning:</strong> The SSH key filled out here can grant root access to the server. Please complete the setup as soon as possible.
       </div>
-      <div class="checkbox">
-        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
+
+      <div class="row">
+        <div class="col">
+          <h3>Admin Access</h3>
+          <div class="form-group">
+            <label for="key">Public SSH Keys</label><br />
+            <textarea class="form-control" name="keys" rows="5" id="key" placeholder="Begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'">{ADMIN_KEYS}</textarea>
+            <small class="form-text text-muted">Public keys allow users to ssh onto the server as the <code>dokku</code> user, as well as remotely execute Dokku commands. They are currently auto-populated from: <code>{AUTHORIZED_KEYS_LOCATION}</code>, and can be changed later via the  <a href="http://dokku.viewdocs.io/dokku/deployment/user-management/" target="_blank"><code>dokku ssh-keys</code></a> plugin.</small>
+          </div>
+        </div>
       </div>
-      <p>Your app URLs will look like:</p>
-      <pre id="example">http://hostname:port</pre>
-    </div>
-    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
-  </form>
+
+      <div class="row">
+        <div class="col">
+          <h3>Hostname Configuration</h3>
+          <div class="form-group">
+            <label for="hostname">Hostname</label>
+            <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" placeholder="A hostname or ip address such as {HOSTNAME}" />
+            <small class="form-text text-muted">This will be used as the default host for all applications, and can be changed later via the <a href="http://dokku.viewdocs.io/dokku/configuration/domains/" target="_blank"><code>dokku domains:set-global</code></a> command.</small>
+          </div>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="vhost" name="vhost" value="true">
+            <label class="form-check-label" for="vhost">Use virtualhost naming for apps</label>
+            <small class="form-text text-muted">When enabled, Nginx will be run on port 80 and proxy requests to apps based on hostname.</small>
+            <small class="form-text text-muted">When disabled, a specific port will be setup for each application on first deploy, and requests to that port will be proxied to the relevant app.</small>
+          </div>
+          <div class="bd-callout bd-callout-info">
+            <h5>What will app URLs look like?</h5>
+            <pre><code id="example">http://hostname:port</code></pre>
+          </div>
+        </div>
+      </div>
+      <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span class="result"></span>
+    </form>
   </div>
+
   <div id="error-output"></div>
   <script>
+    var $ = document.querySelector.bind(document)
+
     function setup() {
-      if ($.trim($("#key").val()) == "") {
+      if ($("#key").value.trim() == "") {
         alert("Your admin public key cannot be blank.")
         return
       }
-      if ($.trim($("#hostname").val()) == "") {
+      if ($("#hostname").value.trim() == "") {
         alert("Your hostname cannot be blank.")
         return
       }
-      data = $("#form").serialize()
-      $("input,textarea,button").prop("disabled", true);
-      $.post('/setup', data)
-        .done(function() {
-          $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/deployment/application-deployment/";
+      var data = new FormData($("#form"))
+
+      var inputs = [].slice.call(document.querySelectorAll("input, textarea, button"))
+      inputs.forEach(function (input) {
+        input.disabled = true
+      })
+
+      var result = $(".result")
+      fetch("/setup", {method: "POST", body: data})
+        .then(function(response) {
+            if (response.ok) {
+                return response.json()
+            } else {
+                throw new Error('Server returned error')
+            }
+        })
+        .then(function(response) {
+          result.classList.add("text-success");
+          result.textContent = "Success! Redirecting in 3 seconds. .."
+          setTimeout(function() {
+            window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
+          }, 3000);
+        })
+        .catch(function (error) {
+          result.classList.add("text-danger");
+          result.textContent = "Could not send the request"
         })
-        .fail(function(data) {
-          $("#result").html("Something went wrong...")
-          $("#error-output").html(data.responseText)
-        });
     }
+
     function update() {
-      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+      if ($("#vhost").matches(":checked") && $("#hostname").value.match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
         alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-        $("#vhost").prop('checked', false);
+        $("#vhost").checked = false;
       }
-      if ($("#vhost").is(':checked')) {
-        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      if ($("#vhost").matches(':checked')) {
+        $("#example").textContent = "http://<app-name>."+$("#hostname").value
       } else {
-        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+        $("#example").textContent = "http://"+$("#hostname").value+":<app-port>"
       }
     }
-    $("#vhost").change(update);
-    $("#hostname").change(update);
+    $("#vhost").addEventListener("input", update);
+    $("#hostname").addEventListener("input", update);
     update();
   </script>
 </body>

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 --global
+}
+
+main "$@"

contrib/dokku_client.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+export DOKKU_PORT=${DOKKU_PORT:=22}
+export DOKKU_HOST=${DOKKU_HOST:=}
 
-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 +15,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=""
-    if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
+  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 ps:startall ps:stopall " == *" $CMD "* ]] && unset APP
+  [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
+  [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
+  [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
+  # 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-dokku

@@ -0,0 +1,373 @@
+#!/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-dokku.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" "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${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 HISTORY_OTHER HISTORY_TESTS 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" ]] || [[ "$TYPE" == "refactor" ]]; then
+      HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "tests" ]]; then
+      HISTORY_TESTS="${HISTORY_TESTS}"$'\n'"$CHANGELOG_TEXT"
+    else
+      HISTORY_OTHER="${HISTORY_OTHER}"$'\n'"$CHANGELOG_TEXT"
+    fi
+  done
+
+  HISTORY="# History"
+  HISTORY="${HISTORY}"$'\n\n'"## ${NEXT_VERSION}"
+  HISTORY="${HISTORY}"$'\n\n'"Install/update via the bootstrap script:"
+  HISTORY="${HISTORY}"$'\n\n'"\`\`\`shell"
+  HISTORY="${HISTORY}"$'\n'"wget https://raw.githubusercontent.com/dokku/dokku/v${NEXT_VERSION}/bootstrap.sh"
+  HISTORY="${HISTORY}"$'\n'"sudo DOKKU_TAG=v${NEXT_VERSION} bash bootstrap.sh"
+  HISTORY="${HISTORY}"$'\n'"\`\`\`"
+
+  if [[ "$HISTORY_BUG" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Bug Fixes"
+    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
+
+  if [[ "$HISTORY_TESTS" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Tests"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_TESTS"
+  fi
+
+  if [[ "$HISTORY_OTHER" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Other"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER"
+  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" "build")
+
+  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, build], none given"
+  fi
+
+  if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
+  fi
+
+  log-info "Creating $RELEASE release"
+
+  mkdir -p "build"
+  fn-require-bin "docker"
+  fn-require-bin "git"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-require-bin "package_cloud"
+    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
+  fi
+
+  CURRENT_VERSION="$(fn-version-current)"
+  NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
+
+  fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
+  fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
+  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
+  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-publish-package "$IS_RELEASE" "deb" "build/dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+    fn-repo-push-tags "$IS_RELEASE"
+  fi
+
+  if [[ "$IS_RELEASE" != "true" ]]; then
+    git reset -q HEAD plugins/*/plugin.toml
+    git checkout -- plugins/*/plugin.toml
+  fi
+
+  echo "build/dokku_${NEXT_VERSION}_amd64.deb" >build/deb-filename
+  echo "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" >build/rpm-filename
+}
+
+main "$@"

contrib/release-dokku-update

@@ -0,0 +1,160 @@
+#!/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/build-dokku-update.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 "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${PACKAGE_NAME}"
+  return "$?"
+}
+
+fn-publish-package() {
+  declare desc="Publishes a package to packagecloud"
+  declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
+  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
+  local OS_ID ex EXIT_CODE=0
+
+  [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
+  [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
+
+  if [[ "$DIST" == "ubuntu" ]]; then
+    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    for OS_ID in "${OS_IDS[@]}"; do
+      log-info "(release-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" "build")
+
+  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, build], none given"
+  fi
+
+  if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
+  fi
+
+  mkdir -p "build"
+  fn-require-bin "docker"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-require-bin "package_cloud"
+    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
+  fi
+
+  NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
+  IS_RELEASE="$(fn-is-release "$RELEASE")"
+
+  fn-build-dokku || log-fail "Error building package"
+  fn-extract-package "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
+  fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
+
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-publish-package "$IS_RELEASE" "deb" "build/dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  fi
+}
+
+main "$@"

contrib/release-herokuish

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

contrib/release-plugin

@@ -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 "$@"

deb.mk

@@ -1,13 +1,21 @@
+BUILD_DIRECTORY ?= /tmp
+
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.18
+HEROKUISH_VERSION ?= 0.4.6
 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 +23,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 +34,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.5.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 +60,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"
@@ -63,13 +71,13 @@ install-from-deb:
 	wget -nv -O - https://get.docker.com/ | sh
 
 	@echo "--> Installing dokku"
-	wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
-	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
+	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2> /dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq > /dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku
 
-deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil
-	mv /tmp/*.deb .
+deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update
+	mv $(BUILD_DIRECTORY)/*.deb .
 	@echo "Done"
 
 deb-setup:
@@ -86,31 +94,31 @@ 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" --branch "v$(HEROKUISH_VERSION)" /tmp/tmp/herokuish > /dev/null
-	rm -rf /tmp/tmp/herokuish/.git /tmp/tmp/herokuish/.gitignore
-
-	@echo "-> Copying files into place"
-	mkdir -p "/tmp/build/var/lib"
-	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish
+	@echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install
 
 	@echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1)' --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
+	sudo fpm -t deb -s dir -C /tmp/build -n herokuish \
+		--version $(HEROKUISH_VERSION) \
+		--architecture $(HEROKUISH_ARCHITECTURE) \
+		--package $(BUILD_DIRECTORY)/$(HEROKUISH_PACKAGE_NAME) \
+		--deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' \
+		--deb-pre-depends sudo \
+		--after-install /tmp/tmp/post-install \
+		--url "https://github.com/$(HEROKUISH_REPO_NAME)" \
+		--description $(HEROKUISH_DESCRIPTION) \
+		--license 'MIT License' \
+		.
 
 deb-dokku:
 	rm -rf /tmp/tmp /tmp/build dokku_*_$(DOKKU_ARCHITECTURE).deb
 	mkdir -p /tmp/tmp /tmp/build
 
 	cp -r debian /tmp/build/DEBIAN
+	mkdir -p /tmp/build/usr/share/bash-completion/completions
 	mkdir -p /tmp/build/usr/bin
 	mkdir -p /tmp/build/usr/share/doc/dokku
 	mkdir -p /tmp/build/usr/share/dokku/contrib
@@ -120,25 +128,52 @@ deb-dokku:
 
 	cp dokku /tmp/build/usr/bin
 	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
+	cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
 	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
 	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 "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+
+deb-dokku-update:
+	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
+	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 $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_PACKAGE_NAME) \
+			 --depends 'dokku' \
+			 --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \
+			 --description $(DOKKU_UPDATE_DESCRIPTION) \
+			 --license 'MIT License' \
+			 contrib/dokku-update=/usr/local/bin/dokku-update \
+			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION
 
 deb-plugn:
 	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
@@ -155,14 +190,13 @@ deb-plugn:
 	sudo fpm -t deb -s dir -C /tmp/build -n plugn \
 			 --version $(PLUGN_VERSION) \
 			 --architecture $(PLUGN_ARCHITECTURE) \
-			 --package $(PLUGN_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(PLUGN_PACKAGE_NAME) \
 			 --url "https://github.com/$(PLUGN_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category utils \
 			 --description "$$PLUGN_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp
 
 deb-sshcommand:
 	rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME)
@@ -180,14 +214,13 @@ deb-sshcommand:
 	sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \
 			 --version $(SSHCOMMAND_VERSION) \
 			 --architecture $(SSHCOMMAND_ARCHITECTURE) \
-			 --package $(SSHCOMMAND_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_PACKAGE_NAME) \
 			 --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category admin \
 			 --description "$$SSHCOMMAND_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp
 
 deb-sigil:
 	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
@@ -204,11 +237,10 @@ deb-sigil:
 	sudo fpm -t deb -s dir -C /tmp/build -n gliderlabs-sigil \
 			 --version $(SIGIL_VERSION) \
 			 --architecture $(SIGIL_ARCHITECTURE) \
-			 --package $(SIGIL_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(SIGIL_PACKAGE_NAME) \
 			 --url "https://github.com/$(SIGIL_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category utils \
 			 --description "$$SIGIL_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp

debian/config

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

debian/control

@@ -1,11 +1,11 @@
 Package: dokku
-Version: 0.7.0
+Version: 0.14.4
 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.7.1) | docker-engine (>= 1.7.1) | docker-io (>= 1.7.1)  | docker.io (>= 1.7.1) | docker-ce | docker-ee, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog
+Recommends: herokuish (>= 0.3.4), parallel, dokku-update
+Pre-Depends: nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python2.7, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 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

@@ -1,11 +1,17 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
   . /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}"
 
@@ -21,10 +27,10 @@ call-sshcommand() {
 }
 
 case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
+  abort-upgrade | abort-remove | abort-deconfigure) ;;
 
-  configure)
+  \
+    configure)
     mandb
     [ ! -x /usr/bin/docker.io ] || ln -sf /usr/bin/docker.io /usr/local/bin/docker
     modprobe aufs || echo "WARNING: Restart server to finish installing dokku!"
@@ -35,7 +41,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`
@@ -50,14 +56,18 @@ case "$1" in
       elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
         rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
       elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available;
+        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
       fi
     done
 
+    db_get "dokku/nginx_enable"
     echo "Enabling all core plugins"
     find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-      if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
+      if [ "$plugin" = "nginx-vhosts" ] && [ "$RET" = "false" ]; then
+        echo "Skipping enable of nginx-vhosts plugin"
+        continue
+      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
       fi
@@ -66,7 +76,7 @@ case "$1" in
     chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
 
     echo "Ensure proper sshcommand path"
-    echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand"
+    echo '/usr/bin/dokku' >"${DOKKU_ROOT}/.sshcommand"
     if [[ -f .ssh/authorized_keys ]]; then
       sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
       rm "${DOKKU_ROOT}/.ssh/authorized_keys"
@@ -87,8 +97,8 @@ case "$1" in
         systemctl enable dokku-installer
       fi
 
-      installer_status="$(service dokku-installer status 2> /dev/null || true)"
-      if echo $installer_status | grep -Eq "(inactive|waiting)" > /dev/null; then
+      installer_status="$(service dokku-installer status 2>/dev/null || true)"
+      if echo $installer_status | grep -Eq "(inactive|waiting)" >/dev/null; then
         echo "Starting dokku-installer"
         service dokku-installer start || echo "Unable to start dokku-installer"
       fi
@@ -100,21 +110,24 @@ 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"
-    echo "$RET" > "${DOKKU_ROOT}/HOSTNAME"
+    echo "$RET" >"${DOKKU_ROOT}/HOSTNAME"
 
     if [ -z "${DEBCONF_RECONFIGURE}" ]; then
       db_get "dokku/key_file"
       if [ -f "$RET" ]; then
-        call-sshcommand acl-add dokku default < "$RET" || true
+        call-sshcommand acl-add dokku default <"$RET" || true
       fi
     fi
     ;;

debian/postrm

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -11,19 +12,24 @@ 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
+  db_get "dokku/nginx_enable"
+  if [ "$RET" = "true" ]; then
+    (nginx -t && service nginx reload) || true
+  fi
 
   if [[ "$1" == "purge" ]]; then
+    rm -f /etc/nginx/conf.d/dokku.conf
+    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

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -23,10 +24,23 @@ case "$1" in
         echo '    proxy_pass  http://dokku-installer;'
         echo '  }'
         echo '}'
-      } >> $NGINX_CONF
+      } >>$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
 
@@ -34,21 +48,21 @@ case "$1" in
     if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
       db_get "dokku/key_file"
       if [ ! -f "$RET" ]; then
-          echo "Error: keyfile '$RET' not found."
-          echo "       you can enter a new keyfile path when you restart the installation."
-          db_reset "dokku/key_file"
-          exit 1
+        echo "Error: keyfile '$RET' not found."
+        echo "       you can enter a new keyfile path when you restart the installation."
+        db_reset "dokku/key_file"
+        exit 1
       fi
     fi
     ;;
 
-  upgrade)
-    ;;
+  upgrade) ;;
 
-  abort-upgrade)
-    ;;
+  \
+    abort-upgrade) ;;
 
-  *)
+  \
+    *)
     echo "preinst called with unknown argument \`$1'" >&2
     exit 1
     ;;

debian/prerm

@@ -1,34 +1,35 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
 readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
 
 ps_backtrace() {
   if [ $# -lt 1 ]; then
-    echo "Usage: $0 PID" > /dev/stderr
+    echo "Usage: $0 PID" >/dev/stderr
     exit 1
   fi
 
-  declare -i pid=$1;
-  ppid=0;
-  header_modifier="";
-  while : ; do
+  declare -i pid=$1
+  ppid=0
+  header_modifier=""
+  while :; do
     if [ $ppid -ne 0 ]; then
-      header_modifier=h;
-    fi;
-    ppid=$(ps -o ppid= $pid);
-    ps uww $header_modifier -p $pid;
+      header_modifier=h
+    fi
+    ppid=$(ps -o ppid= $pid)
+    ps uww $header_modifier -p $pid
     if [ $pid -eq 1 ]; then
-      break;
-    fi;
-    pid=$ppid;
-  done;
+      break
+    fi
+    pid=$ppid
+  done
 }
 
 main() {
   # HACK: Ensure that we only delete data when purging dokku from the system
-  if ps_backtrace $BASHPID 2> /dev/null | grep dpkg | grep -- "--purge" > /dev/null; then
+  if ps_backtrace $BASHPID 2>/dev/null | grep dpkg | grep -- "--purge" >/dev/null; then
     echo "Processing purge"
 
     echo "Destroying deployed applications"
@@ -40,7 +41,7 @@ main() {
     echo "Disabling all core plugins"
     find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
       if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        rm ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
+        rm ${DOKKU_LIB_ROOT}/plugins/available/$plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn disable $plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn disable $plugin
       fi

debian/templates

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

docs/advanced-usage/backup-recovery.md

@@ -4,7 +4,7 @@
 
 ## 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.
+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
@@ -24,14 +24,14 @@ 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.
+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](/dokku/advanced-usage/persistent-storage/) for more details.
+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).
+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 !$

docs/advanced-usage/deployment-tasks.md

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

docs/advanced-usage/docker-options.md

@@ -5,15 +5,15 @@
 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)
+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 myapp deploy,run "-v /home/dokku/logs/myapp:/app/logs"
+> dokku docker-options:add node-js-app deploy,run "-v /var/log/node-js-app:/app/logs"
 > ```
 
 ## About Dokku phases
@@ -22,41 +22,73 @@ Dokku deploys your application in multiple "phases" and the `docker-options` plu
 
 - `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`
+- `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`](/dokku/deployment/one-off-processes/):
+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 myapp deploy "-v /home/dokku/logs/myapp:/app/logs"
-dokku docker-options:add myapp run "-v /home/dokku/logs/myapp:/app/logs"
+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.
 
-### 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"
+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`).
@@ -77,4 +109,4 @@ The above example will result in the following options being passed to Docker du
 
 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/ .
+More information on Docker options can be found here: https://docs.docker.com/engine/reference/commandline/run/.

docs/advanced-usage/event-logs.md

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

docs/advanced-usage/persistent-storage.md

@@ -2,47 +2,113 @@
 
 > 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.
+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
 ```
 
-## Ideology and Background
+> 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 requires explicit paths on the host side. This is intentional to ensure that new users avoid running into unexpected results with implicit paths that may not exist (a feature deprecate in [Docker 1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0])). The container directory is created for the mount point in the container. Any existing directory contents are not accessible after a mount is added to the container. Dokku creates a new directory `/var/lib/dokku/data/storage` during installation, it's the general consensus that new users should use this directory. Mounts are only available at run and deploy times, you must redeploy (restart) an app to mount or unmount to an existing app's container.
+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 the container:
+This example demonstrates how to mount the recommended directory to `/storage` inside an application called `node-js-app`:
 
 ```shell
-dokku storage:mount app-name /var/lib/dokku/data/storage:/storage
+# 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:restart app-name
+```
+
 A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container.
 
 ```shell
-# creating storage for the app 'ruby-rails-sample'
-mkdir -p  /var/lib/dokku/data/storage/ruby-rails-sample
+# 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/ruby-rails-sample
+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
-chown -R 32767:32767 /var/lib/dokku/data/storage/ruby-rails-sample
+# 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/app-name:/app/storage
+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
@@ -63,14 +129,22 @@ Your app may have services that are running in memory and need to be backed up l
 
 ### 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.
+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> "-v /tmp/python-test:/opt/test"
+dokku docker-options:add node-js-app build "-v /tmp/python-test:/opt/test"
 ```
 
-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.
+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`.
 
-## Docker-Options Note
+> 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.
 
-The storage plugins is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy 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, the default `docker-local` scheduler that comes with Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. See the [scheduler-docker-local documentation](/docs/advanced-usage/schedulers/docker-local.md#disabling-chown-of-persistent-storage) docs for more information.

docs/advanced-usage/plugin-management.md

@@ -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.14.4 enabled    dokku core standard plugin
+  20_events            0.14.4 enabled    dokku core events logging plugin
+  apps                 0.14.4 enabled    dokku core apps plugin
+  build-env            0.14.4 enabled    dokku core build-env plugin
+  certs                0.14.4 enabled    dokku core certificate management plugin
+  checks               0.14.4 enabled    dokku core checks plugin
+  common               0.14.4 enabled    dokku core common plugin
+  config               0.14.4 enabled    dokku core config plugin
+  docker-options       0.14.4 enabled    dokku core docker-options plugin
+  domains              0.14.4 enabled    dokku core domains plugin
+  enter                0.14.4 enabled    dokku core enter plugin
+  git                  0.14.4 enabled    dokku core git plugin
+  logs                 0.14.4 enabled    dokku core logs plugin
+  named-containers     0.14.4 enabled    dokku core named containers plugin
+  network              0.14.4 enabled    dokku core network plugin
+  nginx-vhosts         0.14.4 enabled    dokku core nginx-vhosts plugin
+  plugin               0.14.4 enabled    dokku core plugin plugin
+  proxy                0.14.4 enabled    dokku core proxy plugin
+  ps                   0.14.4 enabled    dokku core ps plugin
+  repo                 0.14.4 enabled    dokku core repo plugin
+  shell                0.14.4 enabled    dokku core shell plugin
+  ssh-keys             0.14.4 enabled    dokku core ssh-keys plugin
+  storage              0.14.4 enabled    dokku core storage plugin
+  tags                 0.14.4 enabled    dokku core tags plugin
+  tar                  0.14.4 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/proxy-management.md

@@ -1,142 +0,0 @@
-# Proxy Management
-
-> New as of 0.5.0, Enhanced in 0.6.0
-
-```
-proxy <app>                              # Show proxy settings for app
-proxy:disable <app>                      # Disable proxy for app
-proxy:enable <app>                       # Enable proxy for app
-proxy:ports <app>                        # List proxy port mappings for app
-proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for app
-proxy:ports-clear <app>                  # Clear all proxy port mappings for app
-proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Unset proxy port mappings for app
-proxy:set <app> <proxy-type>             # Set proxy type for app
-```
-
-In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
-
-## Container network interface binding
-
-> New as of 0.5.0
-
-By default, the deployed docker container running your app's web process will bind to the internal docker network interface (i.e. `docker inspect --format '{{ .NetworkSettings.IPAddress }}' $CONTAINER_ID`). This behavior can be modified per app by disabling the proxy (i.e. `dokku proxy:disable <app>`). In this case, the container will bind to an external interface (i.e. `0.0.0.0`) and your app container will be directly accessible by other hosts on your network.
-
-> If a proxy is disabled, dokku will bind your container's port to a random port on the host for every deploy, e.g. `0.0.0.0:32771->5000/tcp`.
-
-By way of example, in the default case, each container is bound to the docker interface:
-
-```shell
-docker ps
-```
-
-```
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS               NAMES
-1b88d8aec3d1        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute                       node-js-app.web.1
-```
-
-As such, the container's IP address will be an internal IP, and thus it is only accessible on the host itself:
-
-```
-docker inspect --format '{{ .NetworkSettings.IPAddress }}' node-js-app.web.1
-```
-
-```
-172.17.0.6
-```
-
-However, you can disable the internal proxying via the `proxy:disable` command so that it will listen on the host's IP address:
-
-```shell
-dokku proxy:disable node-js-app
-
-# container bound to all interfaces
-docker ps
-```
-
-```
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS                     NAMES
-d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   node-js-app.web.1
-```
-
-## Proxy port mapping
-
-> New as of 0.6.0
-
-You can now configure `host -> container` port mappings with the `proxy:ports-*` commands. This mapping is currently supported by the built-in nginx-vhosts plugin.
-
-To inspect the port mapping for a given application, use the `proxy:ports` command:
-
-```shell
-dokku proxy:ports node-js-app
-```
-
-```
------> Port mappings for node-js-app
------> scheme             host port                 container port
-http                      80                        5000
-```
-
-The above application is listening on the host's port `80`, which we can test via curl:
-
-```shell
-curl http://node-js-app.dokku.me
-```
-
-```
-Hello World!
-```
-
-There are cases where we may wish for the service to be listening on more than one port, such as port 8080. Normally, this would not be possible:
-
-```shell
-curl http://node-js-app.dokku.me:8080
-```
-
-```
-curl: (7) Failed to connect to node-js-app.dokku.me port 8080: Connection refused
-```
-
-However, we can use the `proxy:ports-add` command to add a second external port mapping - `8080` - to our application's port `5000`.
-
-```shell
-dokku proxy:ports-add node-js-app http:8080:5000
-```
-
-```
------> Setting config vars
-       DOKKU_PROXY_PORT_MAP: http:80:5000 http:8080:5000
------> Configuring node-js-app.dokku.me...(using built-in template)
------> Creating http nginx.conf
------> Running nginx-pre-reload
-       Reloading nginx
-```
-
-We can now test that port 80 still responds properly:
-
-```shell
-curl http://node-js-app.dokku.me
-```
-
-```
-Hello World!
-```
-
-And our new listening port of `8080` also works:
-
-```shell
-curl http://node-js-app.dokku.me:8080
-```
-
-```
-Hello World!
-```
-
-You can also remove a port mapping that is no longer necessary:
-
-```shell
-dokku proxy:ports-remove node-js-app http:80:5000
-```
-
-By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
-
-> NOTE: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.

docs/advanced-usage/repository-management.md

@@ -3,15 +3,17 @@
 > New as of 0.6.0
 
 ```
-repo:gc <app>                            # Runs 'git gc --agressive' against the application's repo
+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.
 
-## Git Garbage Collection
+## Usage
 
-This will run a git gc --agressive against the applications repo. This is performed on the Dokku host, and not within an application container.
+### 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
@@ -25,7 +27,7 @@ Writing objects: 100% (396/396), done.
 Total 396 (delta 79), reused 315 (delta 0)
 ```
 
-## Clearing Application cache
+### 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:
 

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

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

docs/appendices/0.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/configuration/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/configuration/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/methods/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/advanced-usage/proxy-management/) 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,28 +1,28 @@
 # 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/deployment/zero-downtime-deploys/) 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/advanced-usage/proxy-management/) 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/advanced-usage/proxy-management/) 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:
+- 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`

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.7.0/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/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.7.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.4\/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,28 +35,37 @@ h1 {
   background-size: contain;
   background-repeat: no-repeat;
 }
+.header .nav-item a {
+  font-size: 1.6em;
+}
 .header .navbar-brand a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
+.blurb h2 {
+  font-size: 3.5em;
+}
 .blurb p {
-  font-size: 17px;
+  font-size: 1.9em;
   font-weight: 300;
   margin: 18px 0;
   text-align: center;
 }
+.blurb .btn-lg {
+  font-size: 2.2em;
+}
 .quickstart-code {
   display: block;
   line-height: 1.3em;
   margin: 45px auto;
-  max-width: 750px;
+  max-width: 860px;
   padding: 0;
 }
 .quickstart-code .title {
@@ -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,9 +148,10 @@ h1 {
 }
 .alternate-instructions {
   display: block;
+  font-size: 1.6em;
   line-height: 1.3em;
   margin: 45px auto;
-  max-width: 750px;
+  max-width: 860px;
   padding: 0;
   text-align: center;
 }
@@ -166,12 +177,14 @@ h1 {
 .featurette img {
   width: 400px;
 }
-.slack-channel {
+.slack-channel,
+.sponsors {
   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 {
@@ -187,30 +200,38 @@ h1 {
 .slack-button img {
   height: 1em;
 }
-.team-members img {
-  -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+.sponsors {
+  background-color: #272822;
+  color: #FCFCFC;
+}
+.sponsors a {
+  color: #f0ad4e;
+}
+.sponsors .backer img,
+.sponsors .sponsor img {
   -webkit-border-radius: 3px;
-  -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
   border-radius: 3px;
-  border: 8px solid white;
-  box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
-  display: block;
-  height: 200px;
+  border: 8px solid gray;
   margin: 20px auto 20px auto;
+  max-width: 192px;
 }
-.team-members .fund-link {
+.sponsors .backer img {
+  -webkit-border-radius: 50%;
+  border-radius: 50%;
+  border: 0;
+}
+.sponsors img:hover {
+  -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  box-shadow: 0px 0px 32px 0px rgba(0,0,0,0.75);
+}
+.sponsors .fund-link {
   display: block;
-  font-size: 80%;
+  font-size: .8em;
 }
-.team-member {
-  min-height: 320px;
-}
-.team-member-image img:last-child { display: none }
-.team-member-image:hover img:first-child { display: none; }
-.team-member-image:hover img:last-child { display: inline-block; }
-
 .list-group-item {
   border: none;
+  font-size: 1.1em;
   font-weight: normal;
   padding: .2rem .5rem;
   color: #157577;
@@ -231,7 +252,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 +267,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;
@@ -296,7 +317,7 @@ a.list-group-item {
   right: 0;
   width: auto;
   height: auto;
-  font-size: 0.9em;
+  font-size: 1.2em;
   border-radius: 0 0 0 5px;
   padding: 0 0.5em;
   text-shadow: none;
@@ -320,7 +341,6 @@ code {
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   margin: 0;
-  font-size: 85%;
   background-color: #fff;
   background-color: rgba(0, 0, 0, 0.06);
   color: #333;
@@ -368,6 +388,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
 }
@@ -416,10 +441,9 @@ blockquote {
   font-weight: 700;
   text-transform: uppercase;
   margin: 0;
-  font-size: 14px;
+  font-size: 1.3em;
 }
 .git-improve {
-  font-size: 20px;
   vertical-align: -2px;
   padding-left: 8px;
 }
@@ -434,7 +458,6 @@ blockquote {
 .icon-improve {
   color: #bdbdb5;
   padding: 2px 9px 0 10px;
-  font-size: 14px;
 }
 a .fa {
   display: inline-block;
@@ -585,7 +608,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;
 }
@@ -602,18 +625,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 +1,16 @@
-{ "max-versions": [ "0.3.26", "0.4.14", "0.5.8", "0.6.5", "0.7.0" ] }
+{
+  "max-versions": [
+    "0.3.26", 
+    "0.4.14", 
+    "0.5.8", 
+    "0.6.5", 
+    "0.7.2", 
+    "0.8.2", 
+    "0.9.4", 
+    "0.10.5", 
+    "0.11.6", 
+    "0.12.13", 
+    "0.13.4", 
+    "0.14.4"
+  ]
+}

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,23 +57,25 @@ 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
@@ -92,20 +85,26 @@ Note: The following plugins have been supplied by our community and may not have
 [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
@@ -125,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
 
@@ -132,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
@@ -155,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
 
@@ -166,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
 
@@ -224,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)
@@ -289,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][]      |                       |
@@ -301,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/deploying-with-gitlab-ci.md

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

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

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

docs/configuration/domains.md

@@ -3,17 +3,19 @@
 > New as of 0.3.10
 
 ```
-domains:add <app> DOMAIN                 # Add a domain to app
-domains:add-global <domain>              # Add global domain name
-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:remove-global <domain>           # Remove global domain name
+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](/dokku/advanced-usage/proxy-management/) for information as to how to reconfigure the mappings.
+> Adding a domain before deploying an application will result in port mappings being set. This may cause issues for applications that use non-standard ports, as those will not be automatically detected. Please refer to the [proxy documentation](/docs/networking/proxy-management.md) for information as to how to reconfigure the mappings.
 
 ## Customizing hostnames
 
@@ -23,9 +25,9 @@ Applications typically have the following structure for their hostname:
 scheme://subdomain.domain.tld
 ```
 
-The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial configuration and stored in the `$DOKKU_ROOT/VHOST` file. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
+The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial dokku configuration. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
 
-If a FQDN such as `other.tld` is used as the application name, the default `$DOKKU_ROOT/VHOST` will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+If a FQDN such as `other.tld` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
 
 You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
 
@@ -39,63 +41,125 @@ NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
 echo "$NEW_SUBDOMAIN.$VHOST"
 ```
 
-If the `nginx-hostname` has no output, the normal hostname algorithm will be executed.
+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 myapp
+dokku domains:disable node-js-app
 ```
 
-On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_NGINX_PORT` and/or `DOKKU_NGINX_SSL_PORT` (for services configured to use SSL.)
+On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_PROXY_PORT` and/or `DOKKU_PROXY_SSL_PORT` (for services configured to use SSL.)
 
 
 The domains plugin allows you to specify custom domains for applications. This plugin is aware of any ssl certificates that are imported via `certs:add`. Be aware that disabling domains (with `domains:disable`) will override any custom domains.
 
 ```shell
-# where `myapp` is the name of your app
+# where `node-js-app` is the name of your app
 
 # add a domain to an app
-dokku domains:add myapp example.com
+dokku domains:add node-js-app dokku.me
 
 # list custom domains for app
-dokku domains myapp
+dokku domains node-js-app
 
 # clear all custom domains for app
-dokku domains:clear myapp
+dokku domains:clear node-js-app
 
 # remove a custom domain from app
-dokku domains:remove myapp example.com
+dokku domains:remove node-js-app dokku.me
+
+# set all custom domains for app
+dokku domains:set 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:  node-js-sample.dokku.org
+       Domains global enabled: true
+       Domains global vhosts: dokku.org
+=====> python-sample domains information
+       Domains app enabled: true
+       Domains app vhosts:  python-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. 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).
+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;
+    listen 80 default_server;
+    server_name _;
+    access_log off;
+    return 410;
 }
+
+# To handle HTTPS requests, you can uncomment the following section.
+#
+# Please note that in order to let this work as expected, you need a valid
+# SSL certificate for any domains being served. Browsers will show SSL
+# errors in all other cases.
+#
+# Note that the key and certificate files in the below example need to
+# be copied into /etc/nginx/ssl/ folder.
+#
+# server {
+#     listen 443 ssl;
+#     server_name _;
+#     ssl_certificate /etc/nginx/ssl/cert.crt;
+#     ssl_certificate_key /etc/nginx/ssl/cert.key;
+#     access_log off;
+#     return 410;
+# }
 ```
 
-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`:
+Make sure to reload nginx after creating this file by running `service nginx reload`.
 
-```nginx
-# Swap both conf.d include line and the sites-enabled include line. From:
-include /etc/nginx/conf.d/*.conf;
-include /etc/nginx/sites-enabled/*;
+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).
 
-# to the following
+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.
 
-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.
+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

@@ -5,13 +5,17 @@ Typically an application will require some configuration to run properly. Dokku
 The `config` plugin provides the following commands to manage your variables:
 
 ```
-config (<app>|--global)                                   Display all global or app-specific config vars
-config:get (<app>|--global) KEY                           Display a global or app-specific config value
-config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...] Set one or more config vars
-config:unset (<app>|--global) KEY1 [KEY2 ...]             Unset one or more config vars
+config (<app>|--global)                                                               Pretty-print an app or global environment
+config:get (<app>|--global) KEY                                                       Display a global or app-specific config value
+config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
+config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...]                          Unset one or more config vars
+config:export (<app>|--global) [--envfile]                                            Export a global or app environment
+config:keys (<app>|--global) [--merged]                                               Show keys set in environment
+config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
 ```
+> For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
 
-The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
+Environment variables are available both at run time and during the application build/compilation step for buildpack-based deploys.
 
 For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
 
@@ -23,10 +27,15 @@ You can set multiple environment variables at once:
 dokku config:set node-js-app ENV=prod COMPILE_ASSETS=1
 ```
 
-When setting variables with whitespaces, you need to escape them:
+> Note: Whitespace and special characters get tricky. If you are using dokku locally you don't need to do any special escaping. If you are using dokku over ssh you will need to backslash-escape spaces:
+```shell
+dokku config:set node-js-app KEY="VAL\ WITH\ SPACES"
+```
+
+Dokku can also read base64 encoded values. That's the easiest way to set a value with newlines or spaces. To set a value with newlines you need to base64 encode it first and pass the `--encoded` flag:
 
 ```shell
-dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
+dokku config:set --encoded node-js-app KEY="$(base64 ~/.ssh/id_rsa)"
 ```
 
 When setting or unsetting environment variables, you may wish to avoid an application restart. This is useful when developing plugins or when setting multiple environment variables in a scripted manner. To do so, use the `--no-restart` flag:
@@ -35,25 +44,82 @@ When setting or unsetting environment variables, you may wish to avoid an applic
 dokku config:set --no-restart node-js-app ENV=prod
 ```
 
-If you wish to have the variables output in an `eval`-compatible form, you can use the `--export` flag:
+If you wish to have the variables output in an `eval`-compatible form, you can use the `config:export` command
 
 ```shell
-dokku config node-js-app --export
+dokku config:export node-js-app
 # outputs variables in the form:
 #
 #   export ENV='prod'
 #   export COMPILE_ASSETS='1'
 
 # source in all the node-js-app app environment variables
-eval $(dokku config node-js-app --export)
+eval $(dokku config:export node-js-app)
 ```
 
-You can also output the variables in a single-line for usage in command-line utilities with the `--shell` flag:
+You can control the format of the exported variables with the `--format` flag. 
+`--format=shell` will output the variables in a single-line for usage in command-line utilities:
 
 ```shell
-dokku config node-js-app --shell
+dokku config:export --format shell node-js-app
 
 # outputs variables in the form:
 #
 #   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

@@ -6,6 +6,67 @@ Dokku uses nginx as its server for routing requests to specific applications. By
 nginx:access-logs <app> [-t]             # Show the nginx access logs for an application (-t follows)
 nginx:build-config <app>                 # (Re)builds nginx config for given app
 nginx:error-logs <app> [-t]              # Show the nginx error logs for an application (-t follows)
+nginx:validate [<app>] [--clean]         # Validates and optionally cleans up invalid nginx configurations
+```
+
+## Checking access logs
+
+You may check nginx access logs via the `nginx:access-logs` command. This assumes that app access logs are being stored in `/var/log/nginx/$APP-access.log`, as is the default in the generated `nginx.conf`.
+
+```shell
+dokku nginx:access-logs node-js-app
+```
+
+You may also follow the logs by specifying the `-t` flag.
+
+```shell
+dokku nginx:access-logs node-js-app -t
+```
+
+## Checking error logs
+
+You may check nginx error logs via the `nginx:access-logs` command. This assumes that app error logs are being stored in `/var/log/nginx/$APP-error.log`, as is the default in the generated `nginx.conf`.
+
+```shell
+dokku nginx:error-logs node-js-app
+```
+
+You may also follow the logs by specifying the `-t` flag.
+
+```shell
+dokku nginx:error-logs node-js-app -t
+```
+
+## Regenerating nginx config
+
+In certain cases, your app nginx configs may drift from the correct config for your app. You may regenerate the config at any point via the `nginx:build-config` command. This may fail if there are no current web listeners for your app.
+
+```shell
+dokku nginx:build-config node-js-app
+```
+
+## Validating nginx configs
+
+It may be desired to validate an nginx config outside of the deployment process. To do so, run the `nginx:validate` command. With no arguments, this will validate all app nginx configs, one at a time. A minimal wrapper nginx config is generated for each app's nginx config, upon which `nginx -t` will be run.
+
+```shell
+dokku nginx:validate
+```
+
+As app nginx configs are actually executed within a shared context, it is possible for an individual config to be invalid when being validated standalone but _also_ be valid within the global server context. As such, the exit code for the `nginx:validate` command is the exit code of `nginx -t` against the server's real nginx config.
+
+The `nginx:validate` command also takes an optional `--clean` flag. If specified, invalid nginx configs will be removed.
+
+> Warning: Invalid app nginx config's will be removed _even if_ the config is valid in the global server context.
+
+```shell
+dokku nginx:validate --clean
+```
+
+The `--clean` flag may also be specified for a given app:
+
+```shell
+dokku nginx:validate node-js-app --clean
 ```
 
 ## Customizing the nginx configuration
@@ -15,64 +76,23 @@ nginx:error-logs <app> [-t]              # Show the nginx error logs for an appl
 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:
-  - check it into the root of your app repo for buildpack applications
+  - 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`.
 
-### Example Custom Template
-
-Use case: add an `X-Served-By` header to requests
-
-```go
-server {
-  listen      [::]:{{ .NGINX_PORT }};
-  listen      {{ .NGINX_PORT }};
-  server_name {{ .NOSSL_SERVER_NAME }};
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  # set a custom header for requests
-  add_header X-Served-By www-ec2-01;
-
-  gzip on;
-  gzip_min_length  1100;
-  gzip_buffers  4 32k;
-  gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
-  gzip_vary on;
-  gzip_comp_level  6;
-
-  location    / {
-    proxy_pass  http://{{ .APP }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
-}
-
-upstream {{ .APP }} {
-{{ range .DOKKU_APP_LISTENERS | split " " }}
-  server {{ . }};
-{{ end }}
-}
-```
+> 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_ROOT }}                   Global Dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
 {{ .DOKKU_APP_LISTENERS }}          List of IP:PORT pairs of app containers
-{{ .NGINX_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_NGINX_PORT` config var)
-{{ .NGINX_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_NGINX_SSL_PORT` config var)
+{{ .PROXY_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var)
+{{ .PROXY_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var)
 {{ .NOSSL_SERVER_NAME }}            List of non-SSL VHOSTS
 {{ .PROXY_PORT_MAP }}               List of port mappings (same as `DOKKU_PROXY_PORT_MAP` config var)
 {{ .PROXY_UPSTREAM_PORTS }}         List of configured upstream ports (derived from `DOKKU_PROXY_PORT_MAP` config var)
@@ -81,157 +101,83 @@ upstream {{ .APP }} {
 {{ .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`.
-
-
-### Example HTTP to HTTPS Custom Template
-Use case: a simple dockerfile app that includes `EXPOSE 80`
-
-```go
-server {
-  listen      [::]:80;
-  listen      80;
-  server_name {{ .NOSSL_SERVER_NAME }};
-
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  return 301 https://$host:443$request_uri;
-}
-server {
-  listen      [::]:443 ssl spdy;
-  listen      443 ssl spdy;
-  {{ if .SSL_SERVER_NAME }}server_name {{ .SSL_SERVER_NAME }}; {{ end }}
-
-  access_log  /var/log/nginx/{{ .APP }}-access.log;
-  error_log   /var/log/nginx/{{ .APP }}-error.log;
-
-  ssl_certificate     {{ .APP_SSL_PATH }}/server.crt;
-  ssl_certificate_key {{ .APP_SSL_PATH }}/server.key;
-
-  keepalive_timeout   70;
-  add_header          Alternate-Protocol  443:npn-spdy/2;
-  location    / {
-    proxy_pass  http://{{ .APP }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
-}
-
-upstream {{ .APP }} {
-{{ range .DOKKU_APP_LISTENERS | split " " }}
-  server {{ . }};
-{{ end }}
-}
-```
-
-### Example using new proxy port mapping
-
-```go
-{{ range $port_map := .PROXY_PORT_MAP | split " " }}
-{{ $port_map_list := $port_map | split ":" }}
-{{ $scheme := index $port_map_list 0 }}
-{{ $listen_port := index $port_map_list 1 }}
-{{ $upstream_port := index $port_map_list 2 }}
-
-server {
-  listen      [::]:{{ $listen_port }};
-  listen      {{ $listen_port }};
-  server_name {{ $.NOSSL_SERVER_NAME }};
-  access_log  /var/log/nginx/{{ $.APP }}-access.log;
-  error_log   /var/log/nginx/{{ $.APP }}-error.log;
-
-  location    / {
-
-    gzip on;
-    gzip_min_length  1100;
-    gzip_buffers  4 32k;
-    gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
-    gzip_vary on;
-    gzip_comp_level  6;
-
-    proxy_pass  http://{{ $.APP }}-{{ $upstream_port }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Request-Start $msec;
-  }
-  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
-}
-
-{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
-upstream {{ $.APP }}-{{ $upstream_port }} {
-{{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }}
-{{ $listener_list := $listeners | split ":" }}
-{{ $listener_ip := index $listener_list 0 }}
-{{ $listener_port := index $listener_list 1 }}
-  server {{ $listener_ip }}:{{ $upstream_port }};{{ end }}
-}
-{{ end }}
-```
+> 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):
 
-```go
+```
 include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
 ```
 
 That means you can put additional configuration in separate files, for example to limit the uploaded body size to 50 megabytes, do
 
 ```shell
-mkdir /home/dokku/myapp/nginx.conf.d/
-echo 'client_max_body_size 50M;' > /home/dokku/myapp/nginx.conf.d/upload.conf
-chown dokku:dokku /home/dokku/myapp/nginx.conf.d/upload.conf
+mkdir /home/dokku/node-js-app/nginx.conf.d/
+echo 'client_max_body_size 50m;' > /home/dokku/node-js-app/nginx.conf.d/upload.conf
+chown dokku:dokku /home/dokku/node-js-app/nginx.conf.d/upload.conf
 service nginx reload
 ```
 
-The example above uses additional configuration files directly on the dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/myapp/nginx.conf.d/` directory manually.
+The example above uses additional configuration files directly on the Dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/node-js-app/nginx.conf.d/` directory manually.
+
+For PHP Buildpack users, you will also need to provide a `Procfile` and an accompanying `nginx.conf` file to customize the nginx config *within* the container. The following are example contents for your `Procfile`
+
+    web: vendor/bin/heroku-php-nginx -C nginx.conf -i php.ini php/
+    
+Your `nginx.conf` file - not to be confused with Dokku's `nginx.conf.sigil` - would also need to be configured as shown in this example:
+
+    client_max_body_size 50m;
+    location / {
+        index index.php;
+        try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+Please adjust the `Procfile` and `nginx.conf` file as appropriate.
+
+## Custom Error Pages
+
+By default, Dokku provides custom error pages for the following three categories of errors:
+
+- 4xx: For all non-404 errors with a 4xx response code.
+- 404: For "404 Not Found" errors.
+- 5xx: For all 5xx error responses
+
+These are provided as an alternative to the generic Nginx error page, are shared for _all_ applications, and their contents are located on disk at `/var/lib/dokku/data/nginx-vhosts/dokku-errors`. To customize them for a specific app, create a custom `nginx.conf.sigil` as described above and change the paths to point elsewhere.
 
 ## Domains plugin
 
-See the [domain configuration documentation](/dokku/configuration/domains/).
+See the [domain configuration documentation](/docs/configuration/domains.md).
 
 ## Customizing hostnames
 
-See the [customizing hostnames documentation](/dokku/configuration/domains/#customizing-hostnames).
+See the [customizing hostnames documentation](/docs/configuration/domains.md#customizing-hostnames).
 
 ## Disabling VHOSTS
 
-See the [disabling vhosts documentation](/dokku/configuration/domains/#disabling-vhosts).
+See the [disabling vhosts documentation](/docs/configuration/domains.md#disabling-vhosts).
 
 ## Default site
 
-See the [default site documentation](/dokku/configuration/domains/#default-site).
+See the [default site documentation](/docs/configuration/domains.md#default-site).
 
 ## Running behind a load balancer
 
-See the [load balancer documentation](/dokku/configuration/ssl/#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](/dokku/configuration/ssl/#hsts-header).
+See the [HSTS documentation](/docs/configuration/ssl.md#hsts-header).
 
 ## SSL Configuration
 
-See the [ssl documentation](/dokku/configuration/ssl/).
+See the [ssl documentation](/docs/configuration/ssl.md).
 
 ## Disabling Nginx
 
-See the [proxy documentation](/dokku/advanced-usage/proxy-management/).
+See the [proxy documentation](/docs/advanced-usage/proxy-management.md).
 
 ## Managing Proxy Port mappings
 
-See the [proxy documentation](/dokku/advanced-usage/proxy-management/#proxy-port-mapping).
+See the [proxy documentation](/docs/advanced-usage/proxy-management.md#proxy-port-mapping).

docs/configuration/ssl.md

@@ -7,8 +7,8 @@ Dokku supports SSL/TLS certificate inspection and CSR/Self-signed certificate ge
 ```
 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: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
 ```
 
@@ -17,7 +17,7 @@ certs:update <app> CRT KEY               # Update an SSL Endpoint on an app. Can
 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](/dokku/advanced-usage/proxy-management/) for information as to how to reconfigure the mappings.
+> 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
 
@@ -29,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`.
@@ -41,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/configuration/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](/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/configuration/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
 
@@ -51,49 +50,87 @@ 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.
-
-```shell
-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/configuration/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)
 
 ```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;
@@ -126,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

@@ -1,11 +1,15 @@
 # Deploying to Dokku
 
+> Note: This document uses the hostname `dokku.me` in commands. For your server please
+> substitute your server's hostname instead.
+
 ## Deploy tutorial
 
 Once Dokku has been configured with at least one user, applications can be deployed via a `git push` command. To quickly see Dokku deployment in action, you can use the Heroku Ruby on Rails example app.
 
 ```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 +18,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/community/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 +36,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.
+Once the service creation is complete, set the `DATABASE_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,10 +56,20 @@ 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
 ```
 
+> 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.
+
+> Note: Your private key should be registered with ssh-agent in local development. If you get a
+> permission denied error when pushing you can register your private key by running
+> `ssh-add -k ~/<your private key>`.
+
 ```
 Counting objects: 231, done.
 Delta compression using up to 8 threads.
@@ -86,27 +100,32 @@ When the deploy finishes, the application's URL will be shown as seen above.
 Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks) or using a project's [dockerfile](https://docs.docker.com/reference/builder/).
 
 
-### Deploying non-master branch
-
-Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku <local branch>:master```
-
-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
@@ -119,6 +138,8 @@ 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:
 
 ```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
 ```
@@ -131,6 +152,8 @@ remote:        http://ruby-rails-sample.dokku.me
 You can also specify fully qualified names, say `app.dokku.me`, as
 
 ```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
 ```
@@ -143,6 +166,8 @@ remote:        http://app.dokku.me
 This is in particular useful, then you want to deploy to root domain, as
 
 ```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
 ```
@@ -160,32 +185,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/configuration/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/methods/dockerfiles/).
-
-## Specifying a custom buildpack
-
-See the [buildpack documentation](/dokku/deployment/methods/buildpacks/).
+See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md).
 
 ## Image tagging
 
-See the [image tagging documentation](/dokku/deployment/methods/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](/dokku/deployment/application-management/#removing-a-deployed-app).
+See the [application management documentation](/docs/deployment/application-management.md#removing-a-deployed-app).
 
-### Renaming a deployed app
+## Renaming a deployed app
 
-See the [application management documentation](/dokku/deployment/application-management/#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/deployment/zero-downtime-deploys/).
+See the [zero-downtime deploy documentation](/docs/deployment/zero-downtime-deploys.md).

docs/deployment/application-management.md

@@ -3,16 +3,28 @@
 > New as of 0.3.1
 
 ```
-apps                                           # List your apps
+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 <app>                                # Locks an app for deployment
+apps:locked <app>                              # Checks if an app is locked for deployment
 apps:rename <old-app> <new-app>                # Rename an app
+apps:report [<app>] [<flag>]                   # Display report about an app
+apps:unlock <app>                              # Unlocks an app for deployment
 ```
 
-You can easily list all available applications using the `apps` command:
+## 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
+dokku apps:list
 ```
 
 ```
@@ -21,10 +33,10 @@ node-js-app
 python-app
 ```
 
-Note that you can easily hide extra output from dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.
+Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.
 
 ```shell
-dokku --quiet apps
+dokku --quiet apps:list
 ```
 
 ```
@@ -32,7 +44,21 @@ node-js-app
 python-app
 ```
 
-## Manually creating an application
+### 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:
 
@@ -50,7 +76,7 @@ Once created, you can configure the application as normal, and deploy the applic
 - create and link datastores
 - set environment variables
 
-## Removing a deployed app
+### 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.
 
@@ -80,7 +106,7 @@ 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
+### Renaming a deployed app
 
 > New as of 0.4.7
 
@@ -108,3 +134,126 @@ 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. Custom domains and SSL certificates will not be copied to the new app.
+
+> Warning: If you have exposed specific ports via docker-options, or performed anything that cannot be done against multiple applications, `apps:clone` may result in errors.
+
+By default, Dokku will deploy this new application, though you can skip the deploy by using the `--skip-deploy` flag:
+
+```shell
+dokku apps:clone --skip-deploy node-js-app io-js-app
+```
+
+Finally, if the application already exists, you may wish to ignore errors resulting from attempting to clone over it. To do so, you can use the `--ignore-existing` flag. A warning will be emitted, but the command will return 0.
+
+```shell
+dokku apps:clone --ignore-existing node-js-app io-js-app
+```
+
+### Locking app deploys
+
+> New as of 0.11.6
+
+If you wish to disable deploying for a period of time, this can be done via deploy locks. Normally, deploy locks exist only for the duration of a deploy so as to avoid deploys from colliding, but a deploy lock can be created by running the `apps:lock` command.
+
+
+```shell
+dokku apps:lock node-js-app
+```
+
+```
+-----> Deploy lock created
+```
+
+### Unlocking app deploys
+
+> New as of 0.11.6
+
+In some cases, it may be necessary to remove an existing deploy lock. This can be performed via the `apps:unlock` command.
+
+> Warning: Removing the deploy lock _will not_ stop in progress deploys. At this time, in progress deploys will need to be manually terminated by someone with server access.
+
+```shell
+dokku apps:unlock node-js-app
+```
+
+```
+ !     A deploy may be in progress.
+ !     Removing the app lock will not stop in progress deploys.
+-----> Deploy lock removed.
+```
+
+### Checking lock status
+
+> New as of 0.13.0
+
+In some cases, you may wish to inspect the state of an app lock. To do so, you can issue an `apps:lock` command. This will exit non-zero if there is no app lock in place.
+
+
+```shell
+dokku apps:locked node-js-app
+```
+
+```
+Deploy lock does not exist
+```
+
+### Displaying reports about an app
+
+> New as of 0.8.1
+
+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/logs.md

@@ -0,0 +1,52 @@
+# Log Management
+
+```
+logs <app> [-h] [-t] [-n num] [-q] [-p process]  # Display recent log output
+logs:failed [<app>]                              # Shows the last failed deploy logs
+```
+
+## Usage
+
+### App Logs
+
+You can easily get logs of an app 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.
+
+### Failed Deploy Logs
+
+> Warning: The default `docker-local` scheduler will "store" these until the next deploy or until the old containers are garbage collected - whichever runs first. If you require the logs beyond this point in time, please ship the logs to a centralized log server.
+
+In some cases, it may be useful to retrieve the logs from a previously failed deploy.
+
+You can retrieve these logs by using the `logs:failed` command
+
+```shell
+dokku logs:failed node-js-app
+```
+
+You can also retrieve the failed logs for each app:
+
+```shell
+dokku logs:failed node-js-app
+```

docs/deployment/methods/buildpacks.md

@@ -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/environment-variables/) 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/deployment/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.
 
@@ -80,7 +85,7 @@ 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/deployment/process-management/) for more details around scaling individual processes.
+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
 
@@ -89,10 +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](/dokku/advanced-usage/repository-management/#clearing-app-cache).
+See the [repository management documentation](/docs/advanced-usage/repository-management.md#clearing-app-cache).

docs/deployment/methods/dockerfiles.md

@@ -6,22 +6,58 @@ 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 would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/dokku/advanced-usage/proxy-management/).
+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
 
@@ -34,7 +70,7 @@ ENTRYPOINT ["node"]
 You can do:
 
 ```shell
-dokku config:set APP DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
+dokku config:set node-js-app DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
 ```
 
 To tell docker what to run.
@@ -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 supported by creating a [receive-branch](/docs/development/plugin-triggers.md#receive-branch) plugin trigger in a custom plugin.
+
+### Configuring the GIT_REV Environment Variable
+
+> 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,9 +1,7 @@
-# Image Tag Deployment
+# 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
@@ -11,7 +9,24 @@ tags:deploy <app> <tag>                        # Deploy tagged app image
 tags:destroy <app> <tag>                       # Remove app image tag
 ```
 
-For exampple, you can list all tags for a given application:
+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
@@ -23,6 +38,8 @@ REPOSITORY          TAG                 IMAGE ID            CREATED
 dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
 ```
 
+### Creating a tag
+
 You can also create new tags for that app using the `tags:create` function. Tags should conform to the docker tagging specification for your docker version. As of 1.10, that specification is available [here](https://github.com/docker/docker/blob/master/image/spec/v1.1.md), while users of older versions can check the documentation [here](https://github.com/docker/docker/blob/master/image/spec/v1.md).
 
 ```shell
@@ -46,7 +63,11 @@ dokku/node-js-app   latest              936a42f25901        About a minute ago
 dokku/node-js-app   v1                  936a42f25901        About a minute ago   1.025 GB
 ```
 
-Finally, you can also deploy a local image using the `tags:deploy` command.
+### Deploying an image tag
+
+Finally, you can also deploy a local image using the `tags:deploy` command. When specifying a tag that is not `latest`, the released image will be retagged as the `latest` image tag for the app.
+
+> Warning: For images based on herokuish, using the `tags:deploy` command will reset environment variables written into the image, causing a retag to occur. This will - on average - add two extra layers to your deployed image. Note that this does not affect dockerfile-based images, which are the majority of images deployed via the `tags` command.
 
 ```shell
 dokku tags:deploy node-js-app v1
@@ -79,11 +100,13 @@ dokku tags:deploy node-js-app v1
        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
@@ -107,14 +130,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.
@@ -122,11 +142,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"
@@ -139,9 +159,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"
+ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12"
 ```
+
+## 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

@@ -1,4 +1,4 @@
-# Tarfile Deployment
+# Tarball Deployment
 
 > New as of 0.4.0
 
@@ -7,9 +7,18 @@ tar:from <app> <url>                           # Loads an app tarball from url
 tar:in <app>                                   # Reads an tarball containing the app from stdin
 ```
 
-## Deploying from a tarball
+> 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.
 
-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.
+## 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.
 
@@ -17,6 +26,8 @@ You can place the tarball on an external webserver and deploy via the `tar:from`
 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

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

docs/deployment/process-management.md

@@ -4,32 +4,213 @@
 
 ```
 ps <app>                                       # List processes running in app container(s)
-ps:rebuildall                                  # Rebuild all apps
-ps:rebuild <app>                               # Rebuild an app
-ps:restartall                                  # Restart all deployed app containers
+ps:inspect <app>                               # Displays a sanitized version of docker inspect for an app
+ps:rebuild <app>                               # Rebuild an app from source
+ps:rebuildall                                  # Rebuild all apps from source
+ps:report [<app>] [<flag>]                     # Displays a process report for one or more apps
 ps:restart <app>                               # Restart app container(s)
-ps:scale <app> <proc>=<count> [<proc>=<count>] # Set how many processes of a given process to run
-ps:start <app>                                 # Start app container(s)
-ps:stop <app>                                  # Stop 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:startall                                    # Start all deployed app containers
+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.
+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
+```
+
+### Inspecting app containers
+
+> New as of 0.13.0
+
+A common administrative task to perform is calling `docker inspect` on the containers that are running for an application. This can be an error-prone task to perform, and may also reveal sensitive environment variables if not done correctly. Dokku provides a wrapper around this command via the `ps:inspect` command:
+
+```shell
+dokku ps:inspect node-js-app
+```
+
+This command will gather all the running container IDs for your application and call `docker inspect`, sanitizing the output data so it can be copy-pasted elsewhere safely.
+
+### Rebuilding applications
+
+There are some Dokku commands which will not automatically rebuild an application's environment, or which can be told to skip a rebuild.  For instance, you may wish to run multiple `config:set` commands without a restart so as to speed up configuration. In these cases, you can ultimately trigger an application rebuild using `ps:rebuild`
+
+```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 APP web=1 worker=2
+dokku ps:scale node-js-app web=1
 ```
 
-### DOKKU_SCALE file
+Multiple process types can be scaled at once:
 
-You can optionally create a `DOKKU_SCALE` file in the root of your repository. Dokku expects this file to contain one line for every process defined in your Procfile.
+```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
+```
+
+### Starting all applications
+
+In some cases, it may be necessary to start all applications from scratch - eg. if all Docker containers have been manually stopped. This can be executed via the `ps:startall` command, which supports parallelism in the same manner `ps:rebuildall`, `ps:restartall`, and `ps:stopall` do.
+
+Be aware that no action will be taken if the application containers are running.
+
+```shell
+dokku ps:startall
+```
+
+## Restart Policies
+
+> New as of 0.7.0
+
+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:
 
@@ -38,29 +219,6 @@ 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.
-
-## 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). You can configure this via the relevant `ps` commands:
-
-```shell
-# always restart an exited container
-dokku ps:set-restart-policy node-js-app always
-
-# never restart an exited container
-dokku ps:set-restart-policy node-js-app no
-
-# only restart it on Docker restart if it was not manually stopped
-dokku ps:set-restart-policy node-js-app unless-stopped
-
-# restart only on non-zero exit status
-dokku ps:set-restart-policy node-js-app on-failure
-
-# restart only on non-zero exit status up to 20 times
-dokku ps:set-restart-policy node-js-app 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.

docs/deployment/remote-commands.md

@@ -12,7 +12,7 @@ Host dokku.me
 ## Behavioral modifiers
 
 Dokku also supports certain command-line arguments that augment it's behavior. If using these over ssh, you must use the form `ssh -t dokku@dokku.me -- <command>`
-in order to avoid ssh interpretting dokku arguments for itself.
+in order to avoid ssh interpretting Dokku arguments for itself.
 
 ```
 --quiet                suppress output headers
@@ -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

@@ -5,48 +5,84 @@
 ```
 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                                       # Manage public ssh keys that are allowed to connect to Dokku
 ssh-keys:remove <name>                         # Remove SSH public key by name
 ```
 
 When pushing to Dokku, ssh key based authorization is the preferred authentication method, for ease of use and increased security.
 
-Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the  steps below to manage users on a Dokku server.
+Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the steps below to manage users on a Dokku server.
 
-> Users of older versions of Dokku should use the `sshcommand` binary to manage keys. Please refer to the Dokku documentation for your version for more details.
+> 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.
 
-## Adding deploy users
+## Usage
 
-You can add your public key to Dokku with the following command:
+### 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
+dokku ssh-keys:list
+```
+
+```
+61:21:1f:88:7f:86:d4:3a:68:9f:18:aa:41:4f:bc:3d NAME="admin" SSHCOMMAND_ALLOWED_KEYS="no-agent-forwarding,no-user-rc,no-X11-forwarding,no-port-forwarding"
+```
+
+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
 ```
 
-`KEY_NAME` is the username prefer to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.
-
-Key names are unique, and attempting to re-use a name will result in an error.
-
-> The unique `KEY_NAME` is for ease of identifying the keys. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
-
-As key names are unique, they can be used to remove a public ssh key:
-
-```SHELL
-dokku ssh-keys:remove KEY_NAME
+```
+b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
 ```
 
-Admin users and root can also add keys remotely:
+`KEY_NAME` is the name you want to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.
+
+> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
+
+Admin users and root can add keys remotely by specifying the `dokku` bin on their `ssh` command:
 
 ```shell
-cat ~/.ssh/id_rsa.pub | ssh dokku@dokku.me ssh-keys:add KEY_NAME
+cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
 ```
 
-Finally, if you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
+If you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
 
 ```shell
 cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
 ```
 
+### 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
 
-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. Please see the documentation on that trigger for more information.
+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,22 +6,45 @@
 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:
-
-```shell
-dokku config:set --global DOKKU_DEFAULT_CHECKS_WAIT=30
-dokku config:set node-js-app DOKKU_DEFAULT_CHECKS_WAIT=30
-```
-
-You can also choose to skip checks or disable zero-downtime completely on a per-application/per-process basis
-
-> Note that `checks:disable` will now (as of 0.6.0) cause downtime for that process-type during deployments.
+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
+# process type specification is optional
 dokku checks:skip node-js-app worker,web
 ```
 
@@ -33,8 +56,7 @@ dokku checks:skip node-js-app worker,web
        DOKKU_CHECKS_SKIPPED: worker,web
 ```
 
-Additionally, any given process can only be configured to disable zero-downtime. example:
-
+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
@@ -48,14 +70,107 @@ dokku checks:disable node-js-app worker
        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          
+```
+
+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.
+
+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
+
+> 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.
+
+### Check Instructions
+
+The format of a check instruction is a path or relative URL, optionally followed by the expected content:
+
+```
+/about  Our Amazing Team
+```
+
+The `CHECKS` file can contain multiple checks:
+
+```
+/                       My Amazing App
+/stylesheets/index.css  .body
+/scripts/index.js       $(function()
+/images/logo.png
+```
+
+To check an application that supports multiple hostnames, use relative URLs that include the hostname:
+
+```
+//admin.dokku.me  Admin Dashboard
+//static.dokku.me/logo.png
+```
+
+You can also specify the protocol to explicitly check HTTPS requests:
+
+```
+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.
+
+You can change the default behavior by setting `WAIT`, `TIMEOUT`, and `ATTEMPTS` to different values in the `CHECKS` file:
+
+```
+WAIT=30     # Wait 1/2 minute
+TIMEOUT=60  # Timeout after a minute
+ATTEMPTS=10 # Attempt checks 10 times
+
+/  My Amazing App
+```
 
 ## Manually Invoking Checks
 
@@ -92,7 +207,7 @@ dokku checks:run APP
 Checks can be scoped to a particular process type:
 
 ```shell
-dokku checks:run APP worker
+dokku checks:run node-js-app worker
 ```
 
 ```
@@ -108,7 +223,7 @@ dokku checks:run APP worker
 An app process id may also be specified:
 
 ```shell
-dokku checks:run APP web.2
+dokku checks:run node-js-app web.2
 ```
 
 ```
@@ -124,7 +239,7 @@ dokku checks:run APP web.2
 Non-existent process types will result in an error:
 
 ```shell
-dokku checks:run APP non-existent
+dokku checks:run node-js-app non-existent
 ```
 
 ```
@@ -135,7 +250,7 @@ Invalid process type specified (APP.non-existent)
 Non-existent process ids will *also* result in an error
 
 ```shell
-dokku checks:run APP web.3
+dokku checks:run node-js-app web.3
 ```
 
 ```
@@ -143,88 +258,6 @@ dokku checks:run APP web.3
 Invalid container id specified (APP.web.3)
 ```
 
-## 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.
-
-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
-
-> 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.
-
-### Check Instructions
-
-The format of a check instruction is a path or relative URL, optionally followed by the expected content:
-
-```
-/about  Our Amazing Team
-```
-
-The `CHECKS` file can contain multiple checks:
-
-```
-/                       My Amazing App
-/stylesheets/index.css  .body
-/scripts/index.js       $(function()
-/images/logo.png
-```
-
-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
-```
-
-You can also specify the protocol to explicitly check HTTPS requests:
-
-```
-https://admin.example.com  Admin Dashboard
-https://static.example.com/logo.png
-```
-
-### 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.
-
-You can change the default behavior by setting `WAIT`, `TIMEOUT`, and `ATTEMPTS` to different values in the `CHECKS` file:
-
-```
-WAIT=30     # Wait 1/2 minute
-TIMEOUT=60  # Timeout after a minute
-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:
-
-```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
-```
-
-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:
-
-```shell
-dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=0
-```
-
-### 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.
-
-```shell
-dokku config:set $APP DOKKU_DOCKER_STOP_TIMEOUT=20
-```
-
 ## Example: Successful Rails Deployment
 
 In this example, a Rails application is successfully deployed to dokku. The initial round of checks fails while the server is starting, but once it starts they succeed and the deployment is successful. `WAIT` is set to `10` because our application takes a while to boot up. `ATTEMPTS` is set to `6`, but the third attempt succeeds.
@@ -253,7 +286,7 @@ git push dokku master
 
 ```
 -----> Cleaning up...
------> Building myapp from herokuish...
+-----> Building node-js-app from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -263,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:
@@ -282,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
@@ -290,15 +323,15 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
        Thin web server (v1.6.3 codename Protein Powder)
        Maximum connections set to 1024
        Listening on 0.0.0.0:5000, CTRL+C to stop
-=====> end myapp container output
+=====> end node-js-app container output
 -----> Running post-deploy
------> Configuring myapp.dokku.example.com...
+-----> Configuring myapp.dokku.me...
 -----> Creating http nginx.conf
 -----> Running nginx-pre-reload
        Reloading nginx
 -----> Shutting down old container in 60 seconds
 =====> Application deployed:
-       http://myapp.dokku.example.com
+       http://myapp.dokku.me
 ```
 
 ## Example: Failing Rails Deployment
@@ -327,7 +360,7 @@ git push dokku master
 
 ```
 -----> Cleaning up...
------> Building myapp from herokuish...
+-----> Building node-js-app from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -337,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:
@@ -377,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
@@ -398,9 +431,9 @@ Could not start due to 1 failed checks.
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:242:in `initialize'
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `new'
          vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `postgresql_connection
-=====> end myapp container output
+=====> end node-js-app container output
 /usr/bin/dokku: line 49: 23409 Killed                  dokku deploy "$APP"
-To dokku@dokku.example.com:myapp
+To dokku@dokku.me:myapp
  ! [remote rejected] dokku -> master (pre-receive hook declined)
-error: failed to push some refs to 'dokku@dokku.example.com:myapp'
+error: failed to push some refs to 'dokku@dokku.me:myapp'
 ```

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

@@ -17,7 +17,7 @@ While we do provide official packages for a variety of platforms, as our test su
 
 ## Local Test Execution
 
-- Setup dokku in a [vagrant vm](/dokku/getting-started/install/vagrant)
+- Setup Dokku in a [vagrant vm](/docs/getting-started/install/vagrant.md)
 - Run the following to setup tests and execute them:
 
   ```shell
@@ -29,7 +29,7 @@ While we do provide official packages for a variety of platforms, as our test su
   # execute the entire test suite (linter, bats tests, and app deployment tests)
   make test
 
-  # run linter & update vagrant dokku install from local git clone
+  # run linter & update vagrant Dokku install from local git clone
   make lint copyfiles
 
   # execute all bats tests
@@ -45,4 +45,40 @@ Additionally you may run a specific app deployment tests with a target similar t
 make deploy-test-nodejs-express
 ```
 
-For a full list of test make targets check out `tests.mk` in the root of the dokku repository.
+For a full list of test make targets check out `tests.mk` in the root of the Dokku repository.
+
+## Executing a single test suite
+
+When working on a particular plugin, it may be useful to run _only_ a particular test suite. This can be done by specifying the test suite path:
+
+```shell
+bats tests/unit/10_apps.bats
+```
+
+It is also possible to target multiple test suites at a time.
+
+```shell
+bats tests/unit/10_apps.bats tests/unit/10_certs.bats
+```
+
+## Executing a single test
+
+In order to increase testing velocity, a wrapper script around bats is available that can be used to run a single testcase within a suite.
+
+Tests within a suite may be listed by specifying the suite as a parameter to the `tests/bats-exec-test-single` script.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats
+```
+
+A single test can be specified as a second parameter. The test is selected by fuzzy-match, and only the first match is executed.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats clone
+```
+
+Some special characters are translated in the test listing - specifically the characters `( ) :` - while others are not. The fuzzy matching happens on the test names listed when no second character is invoked, so executing a test with a more specific name will work as expected.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats clone_-2d-2dskip-2ddeploy
+```

docs/getting-started/advanced-installation.md

@@ -1,10 +1,10 @@
 # Advanced installation
 
-You can always install dokku straight from the latest - potentially unstable - master release via the following bash command:
+You can always install Dokku straight from the latest - potentially unstable - master release via the following bash command:
 
 ```shell
 # using a branch results in installing from source
-wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh;
 sudo DOKKU_BRANCH=master bash bootstrap.sh
 ```
 
@@ -26,10 +26,10 @@ sudo SSHCOMMAND_URL=https://raw.githubusercontent.com/yourusername/sshcommand/ma
 
 ## Bootstrap a server from your own repository
 
-The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from your own clone of dokku using the `DOKKU_REPO` environment variable. Example:
+The bootstrap script allows the Dokku repository URL to be overridden to bootstrap a host from your own clone of Dokku using the `DOKKU_REPO` environment variable. Example:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh;
 chmod +x bootstrap.sh
 sudo DOKKU_REPO=https://github.com/yourusername/dokku.git DOKKU_BRANCH=master ./bootstrap.sh
 ```
@@ -44,21 +44,25 @@ cd dokku
 sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install
 ```
 
-## Configuring
+## Skipping herokuish installation
 
-Once dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
+The `herokuish` package is recommended but not required if not using Heroku Buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
+
+## Configuring an unattended installation
+
+Once Dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
+
+For Debian, unattended installation is described [Debian installation guide](/docs/getting-started/install/debian.md).
 
 *You should also stop and disable the `dokku-installer` service to remove public access to adding SSH keys.*
 
-Set up a domain and a wildcard domain pointing to that host. Make sure `/home/dokku/VHOST` is set to this domain. By default it's set to whatever hostname the host has. This file is only created if the hostname can be resolved by dig (`dig +short $(hostname -f)`). Otherwise you have to create the file manually and set it to your preferred domain. If this file still is not present when you push your app, dokku will publish the app with a port number (i.e. `http://example.com:49154` - note the missing subdomain).
+Set up a domain using your preferred vendor and a wildcard domain pointing to the host running dokku. You can manage this global domain using the [domains plugin](/docs/configuration/domains.md).
 
-Follow the [user management documentation](/dokku/deployment/user-management/) in order to add users to dokku.
-
-That's it!
+Follow the [user management documentation](/docs/deployment/user-management.md) in order to add ssh keys for users to Dokku, or to give other Unix accounts access to Dokku.
 
 ## VMs with less than 1GB of memory
 
-Having less than 1GB of system memory available for dokku and its containers, for example Digital Ocean's small 512MB machines, might result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
+Having less than 1GB of system memory available for Dokku and its containers may result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
 
 To work around this issue, it might suffice to augment the linux swap file size to a maximum of twice the physical memory size.
 
@@ -76,4 +80,5 @@ free
 
 echo "/var/swap.img    none    swap    sw    0    0" >> /etc/fstab
 ```
-Reference: https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-memory-swap-file-on-a-vps
+
+[Reference](https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-memory-swap-file-on-a-vps)

docs/getting-started/install/azure.md

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

docs/getting-started/install/debian.md

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

docs/getting-started/install/digitalocean.md

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

docs/getting-started/install/dreamhost.md

@@ -4,10 +4,10 @@ Cloud-init script can be used to automate installation of Dokku on
 Dreamhost (or any other OpenStack-compatible cloud with minimal
 changes).
 
-A new server can be created on DreamHost Cloud from the command line
-using openstack client or from the web UI and with the same command
-use a cloud-init script to install Dokku. Install the [openstack
-cli](https://help.dreamhost.com/hc/en-us/articles/216185658-How-to-Install-the-OpenStack-command-line-clients),
+A new server instance can be created on DreamHost Cloud from the command line
+using OpenStack client or from the web UI and with the same command
+use a cloud-init script to install Dokku. Install the [OpenStack
+CLI](https://help.dreamhost.com/hc/en-us/articles/216185658-How-to-Install-the-OpenStack-command-line-clients),
 download the [DreamHost Cloud credentials
 file](https://iad2.dreamcompute.com/project/access_and_security/api_access/openrc/)
 before proceeding and make sure your public SSH key is added to the
@@ -17,19 +17,19 @@ cloud.
 source openrc.sh # Set the environment variables for DreamHost Cloud
 ```
 
-This allows openstack client to connect to DreamHost API endpoints.
-The command below creates a new server named `my-dokku-instance` based
-on Ubuntu 14.04, with 2GB RAM and 1CPU (the flavor called
-`semisonic`), opening network port access to http and ssh (the
+This allows OpenStack client to connect to DreamHost API endpoints.
+The command below creates a new server instance named `my-dokku-instance`
+based on Ubuntu 14.04, with 2GB RAM and 1CPU (the flavor called
+`supersonic`), opening network port access to HTTP and SSH (the
 `default` security group), and the name of the chosen SSH key. This
 key will be automatically added to the new server in the
-`authorized_keys` for the default SSH user (`dhc-user`), and it will
+`authorized_keys` for the default SSH user (`ubuntu`), and it will
 be reused by Dokku.
 
 ```sh
 openstack server create \
   --image Ubuntu-14.04 \
-  --flavor gp1.semisonic \
+  --flavor gp1.supersonic \
   --security-group default \
   --key-name $YOUR_SSH_KEYNAME \
   --user-data dokku-cloudinit.sh \
@@ -37,7 +37,7 @@ openstack server create \
 ```
 
 The content of dokku-cloudinit.sh script contains instructions to add
-Docker and Dokku's apt repositories and install dokku with the proper
+Docker and Dokku's apt repositories and install Dokku with the proper
 debconf options set. Don't forget to add the FQDN for your application
 server:
 
@@ -178,8 +178,20 @@ debconf_selections: |
     # set the domain name of the new Dokku server
     dokku dokku/hostname string $YOUR_FULL_QUALIFIED_DOMAIN
     # this copies over the public SSH key assigned to the server
-    dokku dokku/key_file string /home/dhc-user/.ssh/authorized_keys
+    dokku dokku/key_file string /home/ubuntu/.ssh/authorized_keys
 
 packages:
    - dokku
 ```
+
+Shortly after running the create command you will get a confirmation that the
+instance has been created, and after about a minute it should be ready to login.
+Check the IP of the instance through the web UI or by running:
+
+```sh
+nova list
+```
+
+SSH with the `ubuntu` username and the public key previously added.
+Keep in mind that if you logged in quick enough dokku might still be installing
+in the background, and not be ready. The installation takes a few minutes.

docs/getting-started/install/linode.md

@@ -1,41 +0,0 @@
-# Installing on Linode
-
-When installing Dokku on a Linode server, you'll likely see an error during Docker installation:
-
-> Warning: current kernel is not supported by the linux-image-extra-virtual package.  We have no AUFS support.  Consider installing the packages linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.
-
-After 10 seconds, the installation will continue as normal.
-
-This warning is the result of Linode using its own kernel, which does not support AUFS, instead of using the kernel supplied by Ubuntu. If you ignore the warning, Docker will fall back to using the DeviceMapper storage backend and Dokku will work normally. However, AUFS is better tested and will perform better.
-
-If you would like to use AUFS, follow the steps below to install Ubuntu's kernel and configure your server to boot it instead of Linode's.
-
-## Preparing your Linode for AUFS
-
-__Warning__: These steps will delete *everything* on your Linode.
-
-1. Open your server's dashboard in the [Linode Manager](https://manager.linode.com/).
-
-2. Make sure your Linode is [using KVM](https://www.linode.com/docs/platform/kvm#how-to-enable-kvm), not Xen, for virtualization.
-
-3. In the "Rebuild" tab, select "Ubuntu 14.04 LTS", set a root password, and rebuild.
-
-4. Once your Linode has been created, click "Boot" and wait for it to complete.
-
-5. SSH into your Linode as root and run the following commands:
-
-    ```shell
-    apt-get update
-    apt-get -qq upgrade
-    apt-get install linux-image-virtual linux-image-extra-virtual
-    ```
-
-6. When prompted, install Grub onto the first hard drive.
-
-7. Back in your server's dashboard, click "Edit" on its Configuration Profile
-
-8. Change the "Kernel" option to "GRUB 2" and save your changes.
-
-9. Lastly, reboot the Linode.
-
-Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](/dokku/getting-started/installation/) and `bootstrap.sh` will take care of everything else.

docs/getting-started/install/rpm.md

@@ -0,0 +1,27 @@
+# RPM Package Installation Notes
+
+> New as of 0.8.0 *(experimental)*
+
+>**Warning:** Web installer is not available on CentOS. You will need to configure [SSH keys](/docs/deployment/user-management.md#adding-ssh-keys) and [virtual hosts](/docs/configuration/domains.md#customizing-hostnames) using dokku command line interface.
+
+Dokku defaults to being installed via RPM package on CentOS 7. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` Bash script. The following are the steps run by said script:
+
+```shell
+# Install docker
+curl -fsSL https://get.docker.com/ | sh
+
+# Install epel for nginx packages to be available
+sudo yum install -y epel-release
+
+# Install dokku
+curl -s https://packagecloud.io/install/repositories/dokku/dokku/script.rpm.sh | sudo bash
+sudo yum install -y herokuish dokku
+sudo dokku plugin:install-dependencies --core
+systemctl start nginx
+
+# Enable docker and nginx on system startup
+systemctl enable docker
+systemctl enable nginx
+```
+
+The [devicemapper](https://docs.docker.com/engine/userguide/storagedriver/device-mapper-driver/) is the default Docker storage driver on CentOS 7 and defaults to a configuration mode known as `loop-lvm`. This mode is designed to work out-of-the-box with no additional configuration. However, production deployments should not run under `loop-lvm` mode. The preferred configuration for production deployments is [`direct-lvm`](https://docs.docker.com/engine/userguide/storagedriver/device-mapper-driver/#/configure-direct-lvm-mode-for-production).

docs/getting-started/install/vagrant.md

@@ -19,18 +19,25 @@
     # - `DOKKU_IP`
     # - `FORWARDED_PORT`.
     cd path/to/dokku
+    
+    # for most users
     vagrant up
+    
+    # windows users must instead use the following in an elevated command prompt
+    vagrant up dokku-windows
     ```
-- Setup SSH Config in `~/.ssh/config`. The port listed here is usually correct, though you may want to verify that it is the same as the one listed in the output of `vagrant ssh-config dokku`
+
+- Setup SSH Config in `~/.ssh/config`.
 
     ```ini
     Host dokku.me
         Port 22
     ```
 
-- Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says `Use virtualhost naming`. Then click *Finish Setup* to install your key. You'll be directed to application deployment instructions from here.
+    > For users that have customized the IP address of their VM - either in a custom `Vagrantfile` or via the `DOKKU_IP` environment variable - and are not using `10.0.0.2` for the Vagrant IP, you'll need to instead use the output of `vagrant ssh-config dokku` for your `~/.ssh/config` entry. 
 
-Please note, the `dokku.me` domain is setup to point to `10.0.0.2` along with all subdomains (ie yourapp.dokku.me). If you change the `DOKKU_IP` in your vagrant setup you'll need to update your `/etc/hosts` file to point your reconfigured ip address.
+- Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says **Use virtualhost naming**. Then click **Finish Setup** to install your key. You'll be directed to application deployment instructions from here.
+
+Please note, the `dokku.me` domain is setup to point to `10.0.0.2` along with all subdomains (i.e. `yourapp.dokku.me`). If you change the `DOKKU_IP` in your Vagrant setup you'll need to update your `/etc/hosts` file to point your reconfigured ip address.
 
 You are now ready to deploy an app or install plugins.
-

docs/getting-started/installation.md

@@ -6,52 +6,60 @@ Dokku is an extensible, open source Platform as a Service that runs on a single
 
 To start using Dokku, you'll need a system that meets the following minimum requirements:
 
-- A fresh installation of [Ubuntu 14.04 x64](http://www.ubuntu.com/download/) with the FQDN set <sup>[1]</sup>
+- A fresh installation of [Ubuntu 16.04 x64](https://www.ubuntu.com/download), [Ubuntu 14.04 x64](https://www.ubuntu.com/download), [Debian 8.2 x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set <sup>[1]</sup>
 - At least `1GB` of system memory <sup>[2]</sup>
 
 You can *optionally* have a domain name pointed at the host's IP, though this is not necessary.
 
-Dokku is designed for usage on a fresh installation of Ubuntu, and should install all necessary dependencies if installing via the bootstrap method.
+Dokku is designed for usage on a fresh VM installation, and should install all necessary dependencies if installing via the bootstrap method.
 
 ### Installing the latest stable version
 
 #### 1. Install dokku
 
-To install the latest stable version of dokku, you can run the following shell commands:
+To install the latest stable version of Dokku, you can run the following shell commands:
 
 ```shell
-# for debian systems, installs dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.7.0/bootstrap.sh
-sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh
+# for debian systems, installs Dokku via apt-get
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.4/bootstrap.sh;
+sudo DOKKU_TAG=v0.14.4 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
 
+If you're using Debian 8 or Ubuntu 14.04, make sure your package manager is configured to install a sufficiently recent version of nginx<sup>[3]</sup>, otherwise, the installation may fail due to "unmet dependencies" relating nginx.
+
 #### 2. Setup SSH key and Virtualhost Settings
 
-Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure dokku via the web admin.
+Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure Dokku via the web admin.
 
-*If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your dokku installation will remain vulnerable to anyone finding the setup page and inserting their key.*
+Alternatively, instructions to skip the web installer with an unattended installation are available in the [advanced install guide](/docs/getting-started/advanced-installation/#configuring). 
+
+> **Warning:** If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your Dokku installation will remain vulnerable to anyone finding the setup page and inserting their key. You can check if it is still running via `ps auxf | grep dokku-installer`, and it may be stopped via your server's init system - usually either `service dokku-installer stop` or `stop dokku-installer`.
+
+> **Warning:** Web installer is not available on CentOS and Arch Linux. You will need to configure [SSH keys](/docs/deployment/user-management.md#adding-ssh-keys) and [virtual hosts](/docs/configuration/domains.md#customizing-hostnames) using dokku command line interface - see unattended installation linked above.
 
 #### 3. Deploy your first application
-Once you save your settings, the web admin will self-terminate and you should be able to run or deploy to the dokku installation.
+
+Once you save your settings, the web admin will self-terminate and you should be able to run or [deploy to the Dokku installation](/docs/deployment/application-deployment.md).
 
 ### Installing via other methods
 
 For various reasons, certain hosting providers may have other steps that should be preferred to the above. If hosted on any of the following popular hosts, please follow the linked to instructions:
 
-- [Digital Ocean Installation Notes](/dokku/getting-started/install/digitalocean)
-- [DreamHost Cloud Installation Notes](/dokku/getting-started/install/dreamhost/)
-- [Linode Installation Notes](/dokku/getting-started/install/linode/)
-- [Microsoft Azure Installation Notes](/dokku/getting-started/install/azure/)
+- [Digital Ocean Installation Notes](/docs/getting-started/install/digitalocean.md)
+- [DreamHost Cloud Installation Notes](/docs/getting-started/install/dreamhost.md)
+- [Microsoft Azure Installation Notes](/docs/getting-started/install/azure.md)
 
 As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started:
 
-- [Debian Package Installation Notes](/dokku/getting-started/install/debian/)
-- [Vagrant Installation Notes](/dokku/getting-started/install/vagrant/)
-- [Advanced Install Customization](/dokku/getting-started/advanced-installation/)
+- [Debian Package Installation Notes](/docs/getting-started/install/debian.md)
+- [RPM Package Installation Notes](/docs/getting-started/install/rpm.md)
+- [Vagrant Installation Notes](/docs/getting-started/install/vagrant.md)
+- [Advanced Install Customization](/docs/getting-started/advanced-installation.md)
 
 ---
 
 - <sup>[1]: To check whether your system has an fqdn set, run `sudo hostname -f`</sup>
-- <sup>[2]: If your system has less than 1GB of memory, you can use [this workaround](/dokku/getting-started/advanced-installation/#vms-with-less-than-1gb-of-memory).</sup>
+- <sup>[2]: If your system has less than 1GB of memory, you can use [this workaround](/docs/getting-started/advanced-installation.md#vms-with-less-than-1gb-of-memory).</sup>
+- <sup>[3]: nginx >= 1.8.0 can be installed via the [nginx repositories](https://www.nginx.com/resources/admin-guide/installing-nginx-open-source/), or by adding [this PPA](https://launchpad.net/~nginx/+archive/ubuntu/stable) if you're using Ubuntu. nginx >= 1.11.5 is necessary for HTTP/2 support</sup>

docs/getting-started/troubleshooting.md

@@ -43,7 +43,7 @@ __Solution:__
 
 The `remote rejected` error does not give enough information. Anything could have failed.
 
-To enable dokku tracing, simply run the following command:
+To enable Dokku tracing, simply run the following command:
 
 ```shell
 # since 0.3.9
@@ -60,7 +60,7 @@ This will trace all of dokku's activity. If this does not help you, create a [gi
 
 ***
 
-__Symptom:__ I get the aforementioned error in the build phase (after turning on dokku tracing)
+__Symptom:__ I get the aforementioned error in the build phase (after turning on Dokku tracing)
 
   Most errors that happen in this phase are due to transient network issues (either locally or remotely) buildpack bugs.
 
@@ -146,11 +146,61 @@ If you see output similar this when deploying:
  !     tar: Error is not recoverable: exiting now
 ```
 
-it might that the curl command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 3 seconds, total maximum time for operation: 30 seconds), set the following environment variables:
+it might that the curl command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 90 seconds, total maximum time for operation: 600 seconds), set the following environment variables:
 
 ```shell
-dokku config:set --global CURL_TIMEOUT=600
-dokku config:set --global CURL_CONNECT_TIMEOUT=30
+dokku config:set --global CURL_TIMEOUT=1200
+dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
 
 Please see https://github.com/dokku/dokku/issues/509
+
+Another reason for this error (although it may respond immediately ruling out a timeout issue) may be because you've set the config setting `SSL_CERT_FILE`. Using a config setting with this key interferes with the buildpack's ability to download it's dependencies, so you must rename the config setting to something else, e.g. `MY_APP_SSL_CERT_FILE`.
+
+***
+
+__Symptom:__ Build fails with `Killed` message.
+
+__Solution:__
+
+This generally occurs when the server runs out of memory. You can either add more ram to your server or setup swap space. The follow script will create 2gb of swap space.
+
+```shell
+sudo install -o root -g root -m 0600 /dev/null /swapfile
+dd if=/dev/zero of=/swapfile bs=1k count=2048k
+mkswap /swapfile
+swapon /swapfile
+echo "/swapfile       swap    swap    auto      0       0" | sudo tee -a /etc/fstab
+sudo sysctl -w vm.swappiness=10
+echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf
+```
+
+***
+
+__Symptom:__ I successfully deployed my application with no deployment errors but I'm receiving Connection Timeout when attempting to access the application.
+
+__Solution:__
+
+This can occur if Dokku is running on a system with a firewall like ufw enabled (some OS versions like Ubuntu 16.04 have this enabled by default). You can check if this is your case by running the following script:
+
+```shell
+sudo ufw status
+```
+
+If the previous script returned `Status: active` and a list of ports, ufw is enabled and is probably the cause of the symptom described above. To disable it, run:
+
+```shell
+sudo ufw disable
+```
+
+***
+
+__Symptom:__ I can't connect to my application because the server is sending an invalid response, or can't provide a secure connection.
+
+__Solution:__
+
+This isn't usually an issue with Dokku, but rather an app config problem. This can happen when your application is configured to enforce secure connections/HSTS, but you don't have SSL set up for the app.
+
+In Rails at least, if your `application.rb` or `environmnents/production.rb` include the line `configure.force_ssl = true`, which includes HSTS try commenting that out and redeploying.
+
+If this solves the issue temporarily, longer term you should consider [configuring SSL](http://dokku.viewdocs.io/dokku/configuration/ssl/).

docs/getting-started/uninstalling.md

@@ -0,0 +1,54 @@
+# Uninstalling
+
+While we hate to see you go, if you need to uninstall Dokku, the following may help you out:
+
+## Arch Installation
+
+```shell
+# purge dokku from your system
+yaourt -Rsn dokku
+```
+
+## CentOS Installation
+
+```shell
+# uninstall dokku
+yum remove dokku herokuish
+```
+
+## Debian Installation
+
+```shell
+# purge dokku from your system
+apt-get purge -y --force-yes dokku herokuish
+
+# remove any dependencies that are no longer necessary
+apt-get -y --force-yes autoremove
+```
+
+## Makefile Installation
+
+This is a manual deletion process, and as it is not a recommended installation method, there is currently no automated uninstallation.
+
+All service plugins should be unlinked from applications, stopped, and destroyed.
+
+All applications should be stopped, and all docker containers and images deleted:
+
+```shell
+# stop all applications
+dokku ps:stopall
+
+# cleanup containers and images
+dokku cleanup
+```
+
+The following user/group must be deleted:
+
+- user: `dokku`
+- group: `dokku`
+
+The following directories must be deleted:
+
+- `~dokku`
+- `/var/lib/dokku`
+- `/var/log/dokku`

docs/getting-started/upgrading.md

@@ -1,33 +1,95 @@
 # Upgrading
 
-If your version of dokku is pre 0.3.0 (check with `dokku version`), we recommend [a fresh install](/dokku/getting-started/installation/) on a new server.
+If your version of Dokku is pre 0.3.0 (check with `dokku version`), we recommend [a fresh install](/docs/getting-started/installation.md) on a new server.
+
+## Security Updates
+
+For any security related updates, please follow our [twitter account](https://twitter.com/dokku). As Dokku does not run any daemons, the security risk introduced by our software is minimal.
+
+Your operating system may occasionally provide security updates. We recommend setting unattended upgrades for your operating system. Here are some helpful links:
+
+- [Arch Linux System Maintenance](https://wiki.archlinux.org/index.php/System_maintenance)
+- [Centos Automatic Security Updates](https://serversforhackers.com/c/automatic-security-updates-centos)
+- [Debian Unattended Upgrades](https://wiki.debian.org/UnattendedUpgrades)
+- [Ubuntu Unattended Upgrades](https://help.ubuntu.com/community/AutomaticSecurityUpdates)
+
+Docker releases updates periodically to their engine. We recommend reading their release notes and upgrading accordingly. Please see the [Docker documentation](https://docs.docker.com/) for more details.
+
+Finally, we provide a helpful binary called `dokku-update`. This is a recommended package that:
+
+- Can be installed separately, so upgrading Dokku will not affect the running of this package.
+- Automates many of the upgrade instructions for you.
+- Provides a clean way for us to further enhance the upgrade process in the future.
+
+When installing from source, this is available from `contrib/dokku-update`, and is also available on Debian and RPM-based systems from our package repositories under the name `dokku-update`.
 
 ## Migration Guides
 
 Before upgrading, check the migration guides to get comfortable with new features and prepare your deployment to be upgraded.
 
-- [0.5 Migration Guide](/dokku/appendices/0.5.0-migration-guide/)
-- [0.6 Migration Guide](/dokku/appendices/0.6.0-migration-guide/)
+### 0.5 Migration Guide
+
+- [0.5 Migration Guide](/docs/appendices/0.5.0-migration-guide.md)
+
+### 0.6 Migration Guide
+
+- [0.6 Migration Guide](/docs/appendices/0.6.0-migration-guide.md)
+
+### 0.7 Migration Guide
+
+- [0.7 Migration Guide](/docs/appendices/0.7.0-migration-guide.md)
+
+### 0.8 Migration Guide
+
+- [0.8 Migration Guide](/docs/appendices/0.8.0-migration-guide.md)
+
+### 0.9 Migration Guide
+
+- [0.9 Migration Guide](/docs/appendices/0.9.0-migration-guide.md)
+
+### 0.10 Migration Guide
+
+- [0.10 Migration Guide](/docs/appendices/0.10.0-migration-guide.md)
 
 ## Upgrade Instructions
 
-If dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:
+If Dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:
 
 ```shell
+# update your local apt cache
 sudo apt-get update
-dokku apps
-dokku ps:stop <app> # repeat to shut down each running app
-sudo apt-get install -qq -y dokku herokuish
-dokku ps:rebuildall # restart all applications
+
+# stop each running app
+# for 0.11.4 and newer versions, use
+dokku ps:stopall
+# for versions between 0.8.1 and 0.11.3, use
+dokku --quiet apps:list | xargs -L1 dokku ps:stop
+# for versions versions older than 0.8.1, use
+dokku --quiet apps | xargs -L1 dokku ps:stop
+
+# update dokku and its dependencies
+sudo apt-get install -qq -y dokku herokuish sshcommand plugn
+
+# rebuild all of your applications
+dokku ps:rebuildall # rebuilds all applications
 ```
 
+> If you have any applications deployed via the `tags` or `tar` commands, do not run the `ps:rebuildall` command,
+> and instead trigger `ps:rebuild` manually for each `git`-deployed application:
+>
+> ```
+> dokku ps:rebuild APP
+> ```
+>
+> Please see the [images documentation](/docs/deployment/methods/images.md) and [tar documentation](/docs/deployment/methods/tar.md)
+> for instructions on rebuilding applications deployed by those plugins.
+
 ### Upgrade From Source
 
-If you installed dokku from source (less common), upgrade with:
+If you installed Dokku from source (less common), upgrade with:
 
 ```shell
-dokku apps
-dokku ps:stop <app> # repeat to shut down each running app
+dokku --quiet apps | xargs -L1 dokku ps:stop # stops each running app
 cd ~/dokku
 git pull --tags origin master
 
@@ -36,7 +98,7 @@ sudo DOKKU_BRANCH=master make install
 
 # upgrade to debian package-based installation
 sudo make install
-dokku ps:rebuildall # restart all applications
+dokku ps:rebuildall # rebuilds all applications
 ```
 
 To upgrade herokuish from source, upgrade with:

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

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

docs/home.html

@@ -10,32 +10,61 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
+      .sponsors {
+        background-color: #272822;
+        color: #FCFCFC;
+      }
+      .sponsors a {
+        color: #f0ad4e;
+      }
+      .sponsors .backer img,
+      .sponsors .sponsor img {
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        border: 8px solid gray;
+        margin: 20px auto 20px auto;
+        max-width: 192px;
+      }
+      .sponsors .backer img {
+        -webkit-border-radius: 50%;
+        border-radius: 50%;
+        border: 0;
+      }
+      .sponsors img:hover {
+        -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+        -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+        box-shadow: 0px 0px 32px 0px rgba(0,0,0,0.75);
+      }
+      .sponsors .fund-link {
+        display: block;
+        font-size: .8em;
+      }
     </style>
   </head>
   <body>
@@ -62,6 +91,9 @@
               <li class="nav-item">
                 <a class="nav-link" href="https://glider-slackin.herokuapp.com/">Slack</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://gliderlabs.us10.list-manage.com/subscribe?u=49c4b06ffd30bcf49ec53c277&amp;id=f526006fd5">Newsletter</a>
+              </li>
             </ul>
           </div>
         </div>
@@ -72,7 +104,7 @@
       <div class="container">
         <div class="row">
           <h2>The smallest PaaS implementation you've ever seen</h2>
-          <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
+          <p>Dokku helps you build and manage the lifecycle of applications</p>
           <div class="blurb-buttons">
             <a class="btn btn-lg btn-warning" href="/{{NAME}}/getting-started/installation/">View Documentation</a>
           </div>
@@ -95,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.7.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.4/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.14.4 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
@@ -122,7 +154,7 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -</span>
+            <span class="command">wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -</span>
           </p>
           <p class="line">
             <span class="path"></span>
@@ -132,7 +164,17 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">echo "deb $SOURCE trusty main" | tee /etc/apt/sources.list.d/dokku.list</span>
+            <span class="command">export OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">echo "utopicvividwilyxenialyakketyzestyartfulbionic" | grep -q "$OS_ID" || OS_ID="trusty"</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">echo "deb $SOURCE $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list</span>
           </p>
           <p class="line">
             <span class="path"></span>
@@ -170,8 +212,8 @@
       </div>
 
       <div class="alternate-instructions">
-        <p>Hate <code>curl | bash</code>? See our official <a href="https://github.com/Azure/azure-quickstart-templates/tree/master/dokku-vm" target="_blank">Azure</a>, <a href="https://www.digitalocean.com/features/one-click-apps/dokku/" target="_blank">DigitalOcean</a>, <a href="/{{NAME}}~{{REF}}/getting-started/install/dreamhost/">DreamHost Cloud</a>, and <a href="/{{NAME}}~{{REF}}/getting-started/install/linode/" target="_blank">Linode</a> instructions.<p>
-        <p>Still no love? <a href="https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md" target="_blank">Contributions welcome</a>!</a>
+        <p>Hate <code>curl | bash</code>? See our official <a href="https://github.com/Azure/azure-quickstart-templates/tree/master/dokku-vm" target="_blank">Azure</a>, <a href="https://www.digitalocean.com/features/one-click-apps/dokku/" target="_blank">DigitalOcean</a>, and <a href="/{{NAME}}~{{REF}}/getting-started/install/dreamhost/">DreamHost Cloud</a> instructions.</p>
+        <p>Still no love? <a href="https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md" target="_blank">Contributions welcome</a>!</a></p>
       </div>
     </div>
 
@@ -223,64 +265,54 @@
       </div>
     </div>
 
-    <div class="container-fluid slack-channel team-members">
-      <h3>Meet the core team</h3>
+    <div class="container-fluid slack-channel sponsors">
+      <h3>Sponsor Dokku</h3>
 
       <div class="row">
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/progrium-hidden.jpg" alt="Jeff Lindsay">
-            <img src="./assets/team/progrium.jpg" alt="Jeff Lindsay">
-          </div>
-          Jeff Lindsay
-          <a class="fund-link" href="https://www.patreon.com/progrium">Sponsor people they sponsor</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/josegonzalez-hidden.jpg" alt="Morris Jobke">
-            <img src="./assets/team/josegonzalez.jpg" alt="Morris Jobke">
-          </div>
-          Jose Diaz-Gonzalez
-          <a class="fund-link" href="http://www.amazon.com/registry/wishlist/36RYHSXCFYDTG/">Buy him something nice</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/u2mejc-hidden.jpg" alt="Justin Clark">
-            <img src="./assets/team/u2mejc.jpg" alt="Justin Clark">
-          </div>
-          Justin Clark
-          <a class="fund-link" href="http://smile.amazon.com/registry/wishlist/3SCPXMNI2EIYV">Feed his dog greenie treats!</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/flink-hidden.jpg" alt="Loïc Guitaut">
-            <img src="./assets/team/flink.jpg" alt="Loïc Guitaut">
-          </div>
-          Loïc Guitaut
-          <a class="fund-link" href="https://www.amazon.com/gp/registry/wishlist/23NWY5AVAGGGO/">Build out his star wars collection</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/michaelshobbs-hidden.jpg" alt="Michael Hobbs">
-            <img src="./assets/team/michaelshobbs.jpg" alt="Michael Hobbs">
-          </div>
-          Michael Hobbs
-          <a class="fund-link" href="https://gratipay.com/~michaelshobbs/">Fund on gratipay</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/morrisjobke-hidden.jpg" alt="Morris Jobke">
-            <img src="./assets/team/morrisjobke.jpg" alt="Morris Jobke">
-          </div>
-          Morris Jobke
-          <a class="fund-link" href="">Get him an ebook</a>
+        <div class="col-md-12">
+
+          <p>Here are a few of our sponsors and backers. Join them and <a href="https://opencollective.com/dokku#sponsor" target="_blank">become a sponsor</a> on OpenCollective!</p>
+
+          <p class="sponsor">
+            <a href="https://opencollective.com/dokku/sponsor/0/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/0/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/1/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/1/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/2/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/2/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/3/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/3/avatar.svg" style="max-width: 192px"></a>
+          </p>
+
+          <p class="backer">
+            <a href="https://opencollective.com/dokku/backer/0/website" target="_blank"><img src="https://opencollective.com/dokku/backer/0/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/1/website" target="_blank"><img src="https://opencollective.com/dokku/backer/1/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/2/website" target="_blank"><img src="https://opencollective.com/dokku/backer/2/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/3/website" target="_blank"><img src="https://opencollective.com/dokku/backer/3/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/4/website" target="_blank"><img src="https://opencollective.com/dokku/backer/4/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/5/website" target="_blank"><img src="https://opencollective.com/dokku/backer/5/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/6/website" target="_blank"><img src="https://opencollective.com/dokku/backer/6/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/7/website" target="_blank"><img src="https://opencollective.com/dokku/backer/7/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/8/website" target="_blank"><img src="https://opencollective.com/dokku/backer/8/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/9/website" target="_blank"><img src="https://opencollective.com/dokku/backer/9/avatar.svg"></a>
+          </p>
+          <p class="backer">
+            <a href="https://opencollective.com/dokku/backer/10/website" target="_blank"><img src="https://opencollective.com/dokku/backer/10/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/11/website" target="_blank"><img src="https://opencollective.com/dokku/backer/11/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/12/website" target="_blank"><img src="https://opencollective.com/dokku/backer/12/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/13/website" target="_blank"><img src="https://opencollective.com/dokku/backer/13/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/14/website" target="_blank"><img src="https://opencollective.com/dokku/backer/14/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/15/website" target="_blank"><img src="https://opencollective.com/dokku/backer/15/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/16/website" target="_blank"><img src="https://opencollective.com/dokku/backer/16/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/17/website" target="_blank"><img src="https://opencollective.com/dokku/backer/17/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/18/website" target="_blank"><img src="https://opencollective.com/dokku/backer/18/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/19/website" target="_blank"><img src="https://opencollective.com/dokku/backer/19/avatar.svg"></a>
+          </p>
+
+          <p>You can also <a href="https://www.patreon.com/dokku" target="_blank">back us anonymously</a> on Patreon.</p>
         </div>
       </div>
     </div>
 
     <div class="container">
       <footer>
-        <p>&copy; 2013-2016 Dokku</p>
+        <p>&copy; 2013-2019 Dokku</p>
       </footer>
     </div>
     <script>

docs/networking/dns.md

@@ -14,7 +14,7 @@ Because there are so many different DNS server packages out there as well as a t
 
 * We assume you have a passing familiarity with DNS.  If not, you can read an [in-depth article](http://www.diaryofaninja.com/blog/2012/03/03/devops-dns-for-developers-ndash-now-therersquos-no-excuse-not-to-know) on DNS.  But basically you need to know that DNS changes names (like example.tld) into addresses (like 127.0.0.1)
 * We assume you already have a domain name registered and pointed to your favorite Managed DNS Provider or have your own BIND DNS server running.
-* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md) to get dokku installed.  Don't do the install just yet though.
+* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md) to get Dokku installed.  Don't do the install just yet though.
 
 ## Caching
 
@@ -24,20 +24,19 @@ Please remember that DNS relies heavily on _caching_.  Changes you make to DNS c
 
 Don't be afraid to ask if you need help.  Create a [new issue](https://github.com/dokku/dokku/issues) and someone will be glad to assist you.
 
-
 ## Getting started
 
 For the examples, we will use the domain name `example.tld` and the IP address `127.0.0.1`.
 
-Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `myapp1` and `myapp2`, dokku will make them available at `myapp1.example.tld` and `myapp2.example.tld`.
+Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `node-js-app1` and `node-js-app2`, Dokku will make them available at `node-js-app1.example.tld` and `node-js-app2.example.tld`.
 
-To get started, you need to know the IP address of your dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.
+To get started, you need to know the IP address of your Dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.
 
-Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your dokku server, or would you rather use a 'sub domain' for your dokku server?
+Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your Dokku server, or would you rather use a 'sub domain' for your Dokku server?
 
-In other words, do you want your applications on your dokku server accessible via `myapp.example.tld` or via `myapp.myserver.example.tld`?
+In other words, do you want your applications on your Dokku server accessible via `node-js-app.example.tld` or via `node-js-app.myserver.example.tld`?
 
-#### Using a sub-domain (myapp.myserver.example.tld)
+#### Using a sub-domain (node-js-app.myserver.example.tld)
 
 Using a sub-domain is easy.  When you set up your server, you probably gave it a name like `myserver.example.tld`.
 
@@ -70,13 +69,13 @@ If everything is working correctly, you should also be able to query for any oth
 
 If they all return your IP address, you have set DNS up properly for dokku.  You should also be able to `ssh root@myserver.example.tld` and access your server.
 
-Proceed with the setup instructions in the [installation documentation](/dokku/getting-started/installation/)
+Proceed with the setup instructions in the [installation documentation](/docs/getting-started/installation.md)
 
-#### Using the root of your domain (myapp.example.tld)
+#### Using the root of your domain (node-js-app.example.tld)
 
 This section is a work in progress.  It is incomplete.
 
 Using the 'root' of your domain is nearly identical to the previous example.
 
-* hostname is under `example.tld`, still needs `A` record
-* Need to modify `/home/dokku/HOSTNAME` and `/home/dokku/VHOST`
+* hostname is under `example.tld`, still needs `A` record.
+* Update your global domain using the [domains plugin](docs/configuration/domains.md).

docs/networking/network.md

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