From 54ef6514d51fa375c60a969b3d1452bfe6346ba1 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 26 Mar 2019 17:10:32 -0400
Subject: [PATCH 001/163] fix: turn off error logging for validate config

This will allow validation to work if the default logging locations cannot be written to but the configuration is otherwise okay. This will be the case for users with custom nginx configurations that log to other places, such as syslog.
---
 plugins/nginx-vhosts/templates/validate.conf.sigil | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/validate.conf.sigil b/plugins/nginx-vhosts/templates/validate.conf.sigil
index 232fd6d51..cb6a556c5 100644
--- a/plugins/nginx-vhosts/templates/validate.conf.sigil
+++ b/plugins/nginx-vhosts/templates/validate.conf.sigil
@@ -1,2 +1,6 @@
 events { worker_connections 768; }
-http { include {{ $.NGINX_CONF }}; }
+http {
+  access_log off;
+  error_log /dev/null;
+  include {{ $.NGINX_CONF }};
+}

From 2d1f241677eb0d076ac27d000b879e6a3dfda81f Mon Sep 17 00:00:00 2001
From: David <github@kattfest.se>
Date: Fri, 5 Apr 2019 23:46:36 +0200
Subject: [PATCH 002/163] rails-database -> railsdatabase

Naming the database rails-database throws
```Please specify a valid name for the service. Valid characters are: [A-Za-z0-9_]+```
---
 docs/deployment/application-deployment.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md
index ade89e194..15f3bfe54 100644
--- a/docs/deployment/application-deployment.md
+++ b/docs/deployment/application-deployment.md
@@ -32,8 +32,8 @@ When you create a new app, Dokku by default *does not* provide any datastores su
 # plugin installation requires root, hence the user change
 sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
 
-# create a postgres service with the name rails-database
-dokku postgres:create rails-database
+# create a postgres service with the name railsdatabase
+dokku postgres:create railsdatabase
 ```
 
 > Each service may take a few moments to create.
@@ -45,7 +45,7 @@ Once the service creation is complete, set the `DATABASE_URL` environment variab
 ```shell
 # on the Dokku host
 # each official datastore offers a `link` method to link a service to any application
-dokku postgres:link rails-database ruby-rails-sample
+dokku postgres:link railsdatabase ruby-rails-sample
 ```
 
 > You can link a single service to multiple applications or use one service per application.

From 9486576addea05281279b21216f188d3ebeaeb00 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 16:56:38 -0400
Subject: [PATCH 003/163] fix: drop nil err reference from log output

---
 plugins/common/common.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common/common.go b/plugins/common/common.go
index 2348b534f..99dd24d65 100644
--- a/plugins/common/common.go
+++ b/plugins/common/common.go
@@ -328,7 +328,7 @@ func VerifyAppName(appName string) (err error) {
 	dokkuRoot := MustGetEnv("DOKKU_ROOT")
 	appRoot := strings.Join([]string{dokkuRoot, appName}, "/")
 	if !DirectoryExists(appRoot) {
-		return fmt.Errorf("app %s does not exist: %v", appName, err)
+		return fmt.Errorf("app %s does not exist", appName)
 	}
 	r, _ := regexp.Compile("^[a-z0-9].*")
 	if !r.MatchString(appName) {

From 8ad74d081494a25fc4f9f5e8fa76ef35f66bd59f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 16:56:51 -0400
Subject: [PATCH 004/163] fix: correct buildpack plugin version

---
 plugins/buildpacks/plugin.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 0b6f00dab..8804437b6 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.14.2"
+version = "0.14.6"
 [plugin.config]

From 5b2d4b3559ff0a6be953c8455a20b1f4f29f907d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 16:57:02 -0400
Subject: [PATCH 005/163] feat: add initial documentation for resource
 management plugin

---
 docs/advanced-usage/resource-management.md | 256 +++++++++++++++++++++
 1 file changed, 256 insertions(+)
 create mode 100644 docs/advanced-usage/resource-management.md

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
new file mode 100644
index 000000000..64f4e3486
--- /dev/null
+++ b/docs/advanced-usage/resource-management.md
@@ -0,0 +1,256 @@
+# Resource Management
+
+> New as of 0.15.0
+
+```
+dokku resource:limit --process-types <process-type,...> [RESOURCE_OPTS...] <app>
+dokku resource:reserve --process-types <process-type,...> [RESOURCE_OPTS...] <app>
+dokku resource:limit-defaults [RESOURCE_OPTS...]
+dokku resource:reserve-defaults [RESOURCE_OPTS...]
+dokku resource:limit-clear [<app>]
+dokku resource:reserve-clear [<app>]
+dokku resource:report [<app>]
+```
+
+The resource plugin is meant to allow users to limit or reserve resources for a given app/process-type combination.
+
+## Usage
+
+By default, Dokku allows unlimited resource access to apps deployed on a server. In some cases, it may be desirable to limit this on a per-app or per-process-type basis. The `resource` plugin allows management of both resource "limits" and resource "reservations", where each resource request type has specific meaning to the scheduler in use for a given app.
+
+> The meaning of a values and it's units are specific to the scheduler in use for a given app. If a scheduler does not support a given resource type combination, it will be ignored. All resource commands require an app rebuild or deploy in order to take effect.
+
+Valid resource options include:
+
+- `--cpu`
+- `--memory`
+- `--memory-swap`
+- `--network`
+- `--network-ingress`
+- `--network-egress`
+
+### Resource Limits
+
+When specified and supported, a resource limit will ensure that your app does not go _over_ the specified value. If this occurs, the underlying scheduler may either cap resource utilization, or it may decide to terminate and reschedule your process.
+
+Resource limits may be set via the `resource:limit` command:
+
+```shell
+dokku resource:limit --memory 100 node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app
+       memory: 100
+```
+
+Multiple resources can be limited in a single call:
+
+```shell
+dokku resource:limit --cpu 100 --memory 100 node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app
+       cpu: 100
+       memory: 100
+```
+
+Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
+
+```shell
+dokku resource:limit --cpu 100 --memory 100 --process-types worker node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app (worker)
+       cpu: 100
+       memory: 100
+```
+
+#### Default Resource Limits
+
+By default, Dokku does not limit any resources, though these can be specified at the server level via the `resource:limit-defaults` command. As with the `resource:limit` command, any and all resource request types can be specified.
+
+```shell
+dokku resource:limit-defaults --memory 100
+```
+
+```
+=====> Setting default resource limits
+       memory: 100
+```
+
+### Clearing Resource Limits
+
+In cases where the values are incorrect - or there is no desire to limit resources - resource limits may be cleared using the `resource:limit-clear` command.
+
+```shell
+dokku resource:limit-clear node-js-app
+```
+
+```
+-----> Clearing resource limit for node-js-app
+```
+
+Defaults can also be cleared by leaving the app unspecified.
+
+```shell
+dokku resource:limit-clear
+```
+
+```
+-----> Clearing default resource limits
+```
+
+### Resource Reservations
+
+When specified and supported, a resource reservation will ensure that your server has _at least_ the specified resources before placing a given app's process. If there a resource exhaustion, future rebuilds and deploys may fail.
+
+Resource reservations may be set via the `resource:reserve` command:
+
+```shell
+dokku resource:reserve --memory 100 node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app
+       memory: 100
+```
+
+Multiple resources can be limited in a single call:
+
+```shell
+dokku resource:reserve --cpu 100 --memory 100 node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app
+       cpu: 100
+       memory: 100
+```
+
+Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
+
+```shell
+dokku resource:reserve --cpu 100 --memory 100 --process-types worker node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app (worker)
+       cpu: 100
+       memory: 100
+```
+
+#### Default Resource Reservations
+
+By default, Dokku does not reserve any resources, though these can be specified at the server level via the `resource:reserve-defaults` command. As with the `resource:reserve` command, any and all resource request types can be specified.
+
+```shell
+dokku resource:reserve-defaults --memory 100
+```
+
+```
+=====> Setting default resource reservation
+       memory: 100
+```
+
+#### Clearing Resource Reservations
+
+In cases where the values are incorrect - or there is no desire to reserve resources - resource reservations may be cleared using the `resource:reserve-clear` command.
+
+```shell
+dokku resource:reserve-clear node-js-app
+```
+
+```
+-----> Clearing resource reservation for node-js-app
+```
+
+Defaults can also be cleared by leaving the app unspecified.
+
+```shell
+dokku resource:reserve-clear
+```
+
+```
+-----> Clearing default resource reservation
+```
+
+### Displaying resource reports for an app
+
+You can get a report about the app's resource status using the `resource:report` command:
+
+```shell
+dokku resource:report
+```
+
+```
+=====> node-js-app resource information
+       Resource limit cpu:
+       Resource limit memory: 1024
+       Resource limit memory swap: 0
+       Resource limit network: 10
+       Resource limit network ingress:
+       Resource limit network egress:
+       Resource reservation cpu:
+       Resource reservation memory: 512
+       Resource reservation memory swap:
+       Resource reservation network: 8
+       Resource reservation network ingress:
+       Resource reservation network egress:
+=====> python-sample resource information
+       Resource limit cpu:
+       Resource limit memory:
+       Resource limit memory swap:
+       Resource limit network:
+       Resource limit network ingress:
+       Resource limit network egress:
+       Resource reservation cpu:
+       Resource reservation memory:
+       Resource reservation memory swap:
+       Resource reservation network:
+       Resource reservation network ingress:
+       Resource reservation network egress:
+=====> ruby-sample resource information
+       Resource limit cpu:
+       Resource limit memory:
+       Resource limit memory swap:
+       Resource limit network:
+       Resource limit network ingress:
+       Resource limit network egress:
+       Resource reservation cpu:
+       Resource reservation memory:
+       Resource reservation memory swap:
+       Resource reservation network:
+       Resource reservation network ingress:
+       Resource reservation network egress:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku resource:report node-js-app
+```
+
+```
+=====> node-js-app resource information
+       Resource limit cpu:
+       Resource limit memory: 1024
+       Resource limit memory swap: 0
+       Resource limit network: 10
+       Resource limit network ingress:
+       Resource limit network egress:
+       Resource reservation cpu:
+       Resource reservation memory: 512
+       Resource reservation memory swap:
+       Resource reservation network: 8
+       Resource reservation network ingress:
+       Resource reservation network egress:
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku resource:report node-js-app --resource-memory
+```

From 2e895286cf1f37fd3b8f38325d0b215986d4f308 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 17:37:41 -0400
Subject: [PATCH 006/163] docs: drop ability to process multiple process types
 at once

---
 docs/advanced-usage/resource-management.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 64f4e3486..91a9bc9c4 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -3,8 +3,8 @@
 > New as of 0.15.0
 
 ```
-dokku resource:limit --process-types <process-type,...> [RESOURCE_OPTS...] <app>
-dokku resource:reserve --process-types <process-type,...> [RESOURCE_OPTS...] <app>
+dokku resource:limit --process-type <process-type,...> [RESOURCE_OPTS...] <app>
+dokku resource:reserve --process-type <process-type,...> [RESOURCE_OPTS...] <app>
 dokku resource:limit-defaults [RESOURCE_OPTS...]
 dokku resource:reserve-defaults [RESOURCE_OPTS...]
 dokku resource:limit-clear [<app>]
@@ -59,7 +59,7 @@ dokku resource:limit --cpu 100 --memory 100 node-js-app
 Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
 
 ```shell
-dokku resource:limit --cpu 100 --memory 100 --process-types worker node-js-app
+dokku resource:limit --cpu 100 --memory 100 --process-type worker node-js-app
 ```
 
 ```
@@ -133,7 +133,7 @@ dokku resource:reserve --cpu 100 --memory 100 node-js-app
 Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
 
 ```shell
-dokku resource:reserve --cpu 100 --memory 100 --process-types worker node-js-app
+dokku resource:reserve --cpu 100 --memory 100 --process-type worker node-js-app
 ```
 
 ```

From ab88dbb03da3a7028838bd0839c2e08e453858ff Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 17:52:09 -0400
Subject: [PATCH 007/163] feat: Implement resource:limit and resource:reserve

Also add the install and post-delete hooks
---
 plugins/resource/.gitignore                   |   6 +
 plugins/resource/Makefile                     |  37 +++
 plugins/resource/glide.yaml                   |   3 +
 plugins/resource/plugin.toml                  |   4 +
 plugins/resource/resource.go                  |  12 +
 plugins/resource/src/commands/commands.go     |  63 ++++
 plugins/resource/src/glide.lock               |   6 +
 plugins/resource/src/glide.yaml               |   3 +
 .../resource/src/subcommands/limit/limit.go   |  35 ++
 .../src/subcommands/reserve/reserve.go        |  35 ++
 .../resource/src/triggers/install/install.go  |  14 +
 .../src/triggers/post-delete/post-delete.go   |  18 ++
 .../github.com/ryanuber/columnize/.travis.yml |   3 +
 .../github.com/ryanuber/columnize/LICENSE     |  20 ++
 .../github.com/ryanuber/columnize/README.md   |  69 ++++
 .../ryanuber/columnize/columnize.go           | 178 ++++++++++
 .../ryanuber/columnize/columnize_test.go      | 306 ++++++++++++++++++
 plugins/resource/subcommands.go               |  83 +++++
 .../github.com/ryanuber/columnize/.travis.yml |   3 +
 .../github.com/ryanuber/columnize/LICENSE     |  20 ++
 .../github.com/ryanuber/columnize/README.md   |  69 ++++
 .../ryanuber/columnize/columnize.go           | 178 ++++++++++
 .../ryanuber/columnize/columnize_test.go      | 306 ++++++++++++++++++
 23 files changed, 1471 insertions(+)
 create mode 100644 plugins/resource/.gitignore
 create mode 100644 plugins/resource/Makefile
 create mode 100644 plugins/resource/glide.yaml
 create mode 100644 plugins/resource/plugin.toml
 create mode 100644 plugins/resource/resource.go
 create mode 100644 plugins/resource/src/commands/commands.go
 create mode 100644 plugins/resource/src/glide.lock
 create mode 100644 plugins/resource/src/glide.yaml
 create mode 100644 plugins/resource/src/subcommands/limit/limit.go
 create mode 100644 plugins/resource/src/subcommands/reserve/reserve.go
 create mode 100644 plugins/resource/src/triggers/install/install.go
 create mode 100644 plugins/resource/src/triggers/post-delete/post-delete.go
 create mode 100644 plugins/resource/src/vendor/github.com/ryanuber/columnize/.travis.yml
 create mode 100644 plugins/resource/src/vendor/github.com/ryanuber/columnize/LICENSE
 create mode 100644 plugins/resource/src/vendor/github.com/ryanuber/columnize/README.md
 create mode 100644 plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize.go
 create mode 100644 plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize_test.go
 create mode 100644 plugins/resource/subcommands.go
 create mode 100644 plugins/resource/vendor/github.com/ryanuber/columnize/.travis.yml
 create mode 100644 plugins/resource/vendor/github.com/ryanuber/columnize/LICENSE
 create mode 100644 plugins/resource/vendor/github.com/ryanuber/columnize/README.md
 create mode 100644 plugins/resource/vendor/github.com/ryanuber/columnize/columnize.go
 create mode 100644 plugins/resource/vendor/github.com/ryanuber/columnize/columnize_test.go

diff --git a/plugins/resource/.gitignore b/plugins/resource/.gitignore
new file mode 100644
index 000000000..56aebe3b7
--- /dev/null
+++ b/plugins/resource/.gitignore
@@ -0,0 +1,6 @@
+/commands
+/subcommands/*
+/triggers/*
+/install
+/post-delete
+/report
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
new file mode 100644
index 000000000..fde0627dd
--- /dev/null
+++ b/plugins/resource/Makefile
@@ -0,0 +1,37 @@
+include ../../common.mk
+
+GO_ARGS ?= -a
+
+SUBCOMMANDS = subcommands/limit subcommands/reserve
+TRIGGERS = triggers/install triggers/post-delete
+build-in-docker: clean
+	docker run --rm \
+		-v $$PWD/../..:$(GO_REPO_ROOT) \
+		-w $(GO_REPO_ROOT)/plugins/resource \
+		$(BUILD_IMAGE) \
+		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?
+
+build: commands subcommands triggers
+	$(MAKE) triggers-copy
+
+commands: **/**/commands.go
+	go build $(GO_ARGS) -o commands src/commands/commands.go
+
+subcommands: $(SUBCOMMANDS)
+
+subcommands/%: src/subcommands/*/%.go
+	go build $(GO_ARGS) -o $@ $<
+
+clean:
+	rm -rf commands subcommands triggers install post-delete
+
+src-clean:
+	rm -rf .gitignore src triggers vendor Makefile *.go
+
+triggers: $(TRIGGERS)
+
+triggers/%: src/triggers/*/%.go
+	go build $(GO_ARGS) -o $@ $<
+
+triggers-copy:
+	cp triggers/* .
diff --git a/plugins/resource/glide.yaml b/plugins/resource/glide.yaml
new file mode 100644
index 000000000..3f7a96657
--- /dev/null
+++ b/plugins/resource/glide.yaml
@@ -0,0 +1,3 @@
+package: .
+import:
+- package: github.com/ryanuber/columnize
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
new file mode 100644
index 000000000..3e302605c
--- /dev/null
+++ b/plugins/resource/plugin.toml
@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core resource plugin"
+version = "0.14.6"
+[plugin.config]
diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
new file mode 100644
index 000000000..f782c52a2
--- /dev/null
+++ b/plugins/resource/resource.go
@@ -0,0 +1,12 @@
+package resource
+
+type Resource struct {
+	Cpu            string `json:"cpu"`
+	Memory         string `json:"memory"`
+	MemorySwap     string `json:"memory-swap"`
+	Network        string `json:"network"`
+	NetworkIngress string `json:"network-ingress"`
+	NetworkEgress  string `json:"network-egress"`
+}
+
+const PluginName = "resource"
diff --git a/plugins/resource/src/commands/commands.go b/plugins/resource/src/commands/commands.go
new file mode 100644
index 000000000..3a13ddf6e
--- /dev/null
+++ b/plugins/resource/src/commands/commands.go
@@ -0,0 +1,63 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/dokku/dokku/plugins/common"
+	columnize "github.com/ryanuber/columnize"
+)
+
+const (
+	helpHeader = `Usage: dokku resource[:COMMAND]
+
+Manages resource settings for an app
+
+Additional commands:`
+
+	helpContent = `
+    resource:limit [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
+    resource:reserve [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
+`
+)
+
+func main() {
+	flag.Usage = usage
+	flag.Parse()
+
+	cmd := flag.Arg(0)
+	switch cmd {
+	case "resource", "resource:help":
+		usage()
+	case "help":
+		command := common.NewShellCmd(fmt.Sprintf("ps -o command= %d", os.Getppid()))
+		command.ShowOutput = false
+		output, err := command.Output()
+
+		if err == nil && strings.Contains(string(output), "--all") {
+			fmt.Println(helpContent)
+		} else {
+			fmt.Print("\n    resource, Manages resource settings for an app\n")
+		}
+	default:
+		dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT"))
+		if err != nil {
+			fmt.Println("failed to retrieve DOKKU_NOT_IMPLEMENTED_EXIT environment variable")
+			dokkuNotImplementExitCode = 10
+		}
+		os.Exit(dokkuNotImplementExitCode)
+	}
+}
+
+func usage() {
+	config := columnize.DefaultConfig()
+	config.Delim = ","
+	config.Prefix = "    "
+	config.Empty = ""
+	content := strings.Split(helpContent, "\n")[1:]
+	fmt.Println(helpHeader)
+	fmt.Println(columnize.Format(content, config))
+}
diff --git a/plugins/resource/src/glide.lock b/plugins/resource/src/glide.lock
new file mode 100644
index 000000000..fe4a98f07
--- /dev/null
+++ b/plugins/resource/src/glide.lock
@@ -0,0 +1,6 @@
+hash: 1ddab5de41d1514c2722bd7e24758ad4b60bf6956eb5b9b925fa071a1427f149
+updated: 2017-01-03T17:16:50.97156327-08:00
+imports:
+- name: github.com/ryanuber/columnize
+  version: 0fbbb3f0e3fbdc5bae7c6cd5f6c1887ebfb76360
+testImports: []
diff --git a/plugins/resource/src/glide.yaml b/plugins/resource/src/glide.yaml
new file mode 100644
index 000000000..3f7a96657
--- /dev/null
+++ b/plugins/resource/src/glide.yaml
@@ -0,0 +1,3 @@
+package: .
+import:
+- package: github.com/ryanuber/columnize
diff --git a/plugins/resource/src/subcommands/limit/limit.go b/plugins/resource/src/subcommands/limit/limit.go
new file mode 100644
index 000000000..f8256d709
--- /dev/null
+++ b/plugins/resource/src/subcommands/limit/limit.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:limit", flag.ExitOnError)
+	processeType := args.String("process-type", "", "process-type: A process type to manage")
+	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
+	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
+	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
+	network := args.String("network", "", "network: The amount of network bandwidth to limit processes by")
+	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to limit processes by")
+	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to limit processes by")
+	args.Parse(os.Args[2:])
+
+	resources := resource.Resource{
+		Cpu:            *cpu,
+		Memory:         *memory,
+		MemorySwap:     *memorySwap,
+		Network:        *network,
+		NetworkIngress: *networkIngress,
+		NetworkEgress:  *networkEgress,
+	}
+
+	err := resource.CommandLimit(args.Args(), *processeType, resources)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/src/subcommands/reserve/reserve.go b/plugins/resource/src/subcommands/reserve/reserve.go
new file mode 100644
index 000000000..f76167b39
--- /dev/null
+++ b/plugins/resource/src/subcommands/reserve/reserve.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:reserve", flag.ExitOnError)
+	processeType := args.String("process-type", "", "process-type: A process type to manage")
+	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
+	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
+	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
+	network := args.String("network", "", "network: The amount of network bandwidth to reserve for processes")
+	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to reserve for processes")
+	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to reserve for processes")
+	args.Parse(os.Args[2:])
+
+	resources := resource.Resource{
+		Cpu:            *cpu,
+		Memory:         *memory,
+		MemorySwap:     *memorySwap,
+		Network:        *network,
+		NetworkIngress: *networkIngress,
+		NetworkEgress:  *networkEgress,
+	}
+
+	err := resource.CommandReserve(args.Args(), *processeType, resources)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/src/triggers/install/install.go b/plugins/resource/src/triggers/install/install.go
new file mode 100644
index 000000000..77f7d14ed
--- /dev/null
+++ b/plugins/resource/src/triggers/install/install.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/dokku/dokku/plugins/common"
+)
+
+// runs the install step for the resource plugin
+func main() {
+	if err := common.PropertySetup("resource"); err != nil {
+		common.LogFail(fmt.Sprintf("Unable to install the resource plugin: %s", err.Error()))
+	}
+}
diff --git a/plugins/resource/src/triggers/post-delete/post-delete.go b/plugins/resource/src/triggers/post-delete/post-delete.go
new file mode 100644
index 000000000..d22ceccea
--- /dev/null
+++ b/plugins/resource/src/triggers/post-delete/post-delete.go
@@ -0,0 +1,18 @@
+package main
+
+import (
+	"flag"
+
+	"github.com/dokku/dokku/plugins/common"
+)
+
+// destroys the resource property for a given app container
+func main() {
+	flag.Parse()
+	appName := flag.Arg(0)
+
+	err := common.PropertyDestroy("resource", appName)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/src/vendor/github.com/ryanuber/columnize/.travis.yml b/plugins/resource/src/vendor/github.com/ryanuber/columnize/.travis.yml
new file mode 100644
index 000000000..1a0bbea6c
--- /dev/null
+++ b/plugins/resource/src/vendor/github.com/ryanuber/columnize/.travis.yml
@@ -0,0 +1,3 @@
+language: go
+go:
+  - tip
diff --git a/plugins/resource/src/vendor/github.com/ryanuber/columnize/LICENSE b/plugins/resource/src/vendor/github.com/ryanuber/columnize/LICENSE
new file mode 100644
index 000000000..b9c0e2b68
--- /dev/null
+++ b/plugins/resource/src/vendor/github.com/ryanuber/columnize/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2016 Ryan Uber
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/resource/src/vendor/github.com/ryanuber/columnize/README.md b/plugins/resource/src/vendor/github.com/ryanuber/columnize/README.md
new file mode 100644
index 000000000..e47634fc6
--- /dev/null
+++ b/plugins/resource/src/vendor/github.com/ryanuber/columnize/README.md
@@ -0,0 +1,69 @@
+Columnize
+=========
+
+Easy column-formatted output for golang
+
+[![Build Status](https://travis-ci.org/ryanuber/columnize.svg)](https://travis-ci.org/ryanuber/columnize)
+[![GoDoc](https://godoc.org/github.com/ryanuber/columnize?status.svg)](https://godoc.org/github.com/ryanuber/columnize)
+
+Columnize is a really small Go package that makes building CLI's a little bit
+easier. In some CLI designs, you want to output a number similar items in a
+human-readable way with nicely aligned columns. However, figuring out how wide
+to make each column is a boring problem to solve and eats your valuable time.
+
+Here is an example:
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ryanuber/columnize"
+)
+
+func main() {
+    output := []string{
+        "Name | Gender | Age",
+        "Bob | Male | 38",
+        "Sally | Female | 26",
+    }
+    result := columnize.SimpleFormat(output)
+    fmt.Println(result)
+}
+```
+
+As you can see, you just pass in a list of strings. And the result:
+
+```
+Name   Gender  Age
+Bob    Male    38
+Sally  Female  26
+```
+
+Columnize is tolerant of missing or empty fields, or even empty lines, so
+passing in extra lines for spacing should show up as you would expect.
+
+Configuration
+=============
+
+Columnize is configured using a `Config`, which can be obtained by calling the
+`DefaultConfig()` method. You can then tweak the settings in the resulting
+`Config`:
+
+```
+config := columnize.DefaultConfig()
+config.Delim = "|"
+config.Glue = "  "
+config.Prefix = ""
+config.Empty = ""
+```
+
+* `Delim` is the string by which columns of **input** are delimited
+* `Glue` is the string by which columns of **output** are delimited
+* `Prefix` is a string by which each line of **output** is prefixed
+* `Empty` is a string used to replace blank values found in output
+
+You can then pass the `Config` in using the `Format` method (signature below) to
+have text formatted to your liking.
+
+See the [godoc](https://godoc.org/github.com/ryanuber/columnize) page for usage.
diff --git a/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize.go b/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize.go
new file mode 100644
index 000000000..915716a10
--- /dev/null
+++ b/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize.go
@@ -0,0 +1,178 @@
+package columnize
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// Config can be used to tune certain parameters which affect the way
+// in which Columnize will format output text.
+type Config struct {
+	// The string by which the lines of input will be split.
+	Delim string
+
+	// The string by which columns of output will be separated.
+	Glue string
+
+	// The string by which columns of output will be prefixed.
+	Prefix string
+
+	// A replacement string to replace empty fields
+	Empty string
+}
+
+// DefaultConfig returns a *Config with default values.
+func DefaultConfig() *Config {
+	return &Config{
+		Delim:  "|",
+		Glue:   "  ",
+		Prefix: "",
+		Empty:  "",
+	}
+}
+
+// MergeConfig merges two config objects together and returns the resulting
+// configuration. Values from the right take precedence over the left side.
+func MergeConfig(a, b *Config) *Config {
+	var result Config = *a
+
+	// Return quickly if either side was nil
+	if a == nil || b == nil {
+		return &result
+	}
+
+	if b.Delim != "" {
+		result.Delim = b.Delim
+	}
+	if b.Glue != "" {
+		result.Glue = b.Glue
+	}
+	if b.Prefix != "" {
+		result.Prefix = b.Prefix
+	}
+	if b.Empty != "" {
+		result.Empty = b.Empty
+	}
+
+	return &result
+}
+
+// stringFormat, given a set of column widths and the number of columns in
+// the current line, returns a sprintf-style format string which can be used
+// to print output aligned properly with other lines using the same widths set.
+func stringFormat(c *Config, widths []int, columns int) string {
+	// Create the buffer with an estimate of the length
+	buf := bytes.NewBuffer(make([]byte, 0, (6+len(c.Glue))*columns))
+
+	// Start with the prefix, if any was given. The buffer will not return an
+	// error so it does not need to be handled
+	buf.WriteString(c.Prefix)
+
+	// Create the format string from the discovered widths
+	for i := 0; i < columns && i < len(widths); i++ {
+		if i == columns-1 {
+			buf.WriteString("%s\n")
+		} else {
+			fmt.Fprintf(buf, "%%-%ds%s", widths[i], c.Glue)
+		}
+	}
+	return buf.String()
+}
+
+// elementsFromLine returns a list of elements, each representing a single
+// item which will belong to a column of output.
+func elementsFromLine(config *Config, line string) []interface{} {
+	seperated := strings.Split(line, config.Delim)
+	elements := make([]interface{}, len(seperated))
+	for i, field := range seperated {
+		value := strings.TrimSpace(field)
+
+		// Apply the empty value, if configured.
+		if value == "" && config.Empty != "" {
+			value = config.Empty
+		}
+		elements[i] = value
+	}
+	return elements
+}
+
+// runeLen calculates the number of visible "characters" in a string
+func runeLen(s string) int {
+	l := 0
+	for _ = range s {
+		l++
+	}
+	return l
+}
+
+// widthsFromLines examines a list of strings and determines how wide each
+// column should be considering all of the elements that need to be printed
+// within it.
+func widthsFromLines(config *Config, lines []string) []int {
+	widths := make([]int, 0, 8)
+
+	for _, line := range lines {
+		elems := elementsFromLine(config, line)
+		for i := 0; i < len(elems); i++ {
+			l := runeLen(elems[i].(string))
+			if len(widths) <= i {
+				widths = append(widths, l)
+			} else if widths[i] < l {
+				widths[i] = l
+			}
+		}
+	}
+	return widths
+}
+
+// Format is the public-facing interface that takes a list of strings and
+// returns nicely aligned column-formatted text.
+func Format(lines []string, config *Config) string {
+	conf := MergeConfig(DefaultConfig(), config)
+	widths := widthsFromLines(conf, lines)
+
+	// Estimate the buffer size
+	glueSize := len(conf.Glue)
+	var size int
+	for _, w := range widths {
+		size += w + glueSize
+	}
+	size *= len(lines)
+
+	// Create the buffer
+	buf := bytes.NewBuffer(make([]byte, 0, size))
+
+	// Create a cache for the string formats
+	fmtCache := make(map[int]string, 16)
+
+	// Create the formatted output using the format string
+	for _, line := range lines {
+		elems := elementsFromLine(conf, line)
+
+		// Get the string format using cache
+		numElems := len(elems)
+		stringfmt, ok := fmtCache[numElems]
+		if !ok {
+			stringfmt = stringFormat(conf, widths, numElems)
+			fmtCache[numElems] = stringfmt
+		}
+
+		fmt.Fprintf(buf, stringfmt, elems...)
+	}
+
+	// Get the string result
+	result := buf.String()
+
+	// Remove trailing newline without removing leading/trailing space
+	if n := len(result); n > 0 && result[n-1] == '\n' {
+		result = result[:n-1]
+	}
+
+	return result
+}
+
+// SimpleFormat is a convenience function to format text with the defaults.
+func SimpleFormat(lines []string) string {
+	return Format(lines, nil)
+}
diff --git a/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize_test.go b/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize_test.go
new file mode 100644
index 000000000..89dabaa38
--- /dev/null
+++ b/plugins/resource/src/vendor/github.com/ryanuber/columnize/columnize_test.go
@@ -0,0 +1,306 @@
+package columnize
+
+import (
+	"fmt"
+	"testing"
+
+	crand "crypto/rand"
+)
+
+func TestListOfStringsInput(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyLinesOutput(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestLeadingSpacePreserved(t *testing.T) {
+	input := []string{
+		"| Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "   Column B  Column C\n"
+	expected += "x  y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestColumnWidthCalculator(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"Longer than A | Longer than B | Longer than C",
+		"short | short | short",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A       Column B       Column C\n"
+	expected += "Longer than A  Longer than B  Longer than C\n"
+	expected += "short          short          short"
+
+	if output != expected {
+		printableProof := fmt.Sprintf("\nGot:      %+q", output)
+		printableProof += fmt.Sprintf("\nExpected: %+q", expected)
+		t.Fatalf("\n%s", printableProof)
+	}
+}
+
+func TestColumnWidthCalculatorNonASCII(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"⌘⌘⌘⌘⌘⌘⌘⌘ | Longer than B | Longer than C",
+		"short | short | short",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B       Column C\n"
+	expected += "⌘⌘⌘⌘⌘⌘⌘⌘  Longer than B  Longer than C\n"
+	expected += "short     short          short"
+
+	if output != expected {
+		printableProof := fmt.Sprintf("\nGot:      %+q", output)
+		printableProof += fmt.Sprintf("\nExpected: %+q", expected)
+		t.Fatalf("\n%s", printableProof)
+	}
+}
+
+func BenchmarkColumnWidthCalculator(b *testing.B) {
+	// Generate the input
+	input := []string{
+		"UUID A | UUID B | UUID C | Column D | Column E",
+	}
+
+	format := "%s|%s|%s|%s"
+	short := "short"
+
+	uuid := func() string {
+		buf := make([]byte, 16)
+		if _, err := crand.Read(buf); err != nil {
+			panic(fmt.Errorf("failed to read random bytes: %v", err))
+		}
+
+		return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
+			buf[0:4],
+			buf[4:6],
+			buf[6:8],
+			buf[8:10],
+			buf[10:16])
+	}
+
+	for i := 0; i < 1000; i++ {
+		l := fmt.Sprintf(format, uuid()[:8], uuid()[:12], uuid(), short, short)
+		input = append(input, l)
+	}
+
+	config := DefaultConfig()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		Format(input, config)
+	}
+}
+
+func TestVariedInputSpacing(t *testing.T) {
+	input := []string{
+		"Column A       |Column B|    Column C",
+		"x|y|          z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestUnmatchedColumnCounts(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"Value A | Value B",
+		"Value A | Value B | Value C | Value D",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "Value A   Value B\n"
+	expected += "Value A   Value B   Value C   Value D"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternateDelimiter(t *testing.T) {
+	input := []string{
+		"Column | A % Column | B % Column | C",
+		"Value A % Value B % Value C",
+	}
+
+	config := DefaultConfig()
+	config.Delim = "%"
+	output := Format(input, config)
+
+	expected := "Column | A  Column | B  Column | C\n"
+	expected += "Value A     Value B     Value C"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternateSpacingString(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	config.Glue = "    "
+	output := Format(input, config)
+
+	expected := "Column A    Column B    Column C\n"
+	expected += "x           y           z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestSimpleFormat(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	output := SimpleFormat(input)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternatePrefixString(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	config.Prefix = "  "
+	output := Format(input, config)
+
+	expected := "  Column A  Column B  Column C\n"
+	expected += "  x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyFieldReplacement(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | | z",
+	}
+
+	config := DefaultConfig()
+	config.Empty = "<none>"
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         <none>    z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyConfigValues(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := Config{}
+	output := Format(input, &config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestMergeConfig(t *testing.T) {
+	conf1 := &Config{Delim: "a", Glue: "a", Prefix: "a", Empty: "a"}
+	conf2 := &Config{Delim: "b", Glue: "b", Prefix: "b", Empty: "b"}
+	conf3 := &Config{Delim: "c", Prefix: "c"}
+
+	m := MergeConfig(conf1, conf2)
+	if m.Delim != "b" || m.Glue != "b" || m.Prefix != "b" || m.Empty != "b" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, conf3)
+	if m.Delim != "c" || m.Glue != "a" || m.Prefix != "c" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, nil)
+	if m.Delim != "a" || m.Glue != "a" || m.Prefix != "a" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, &Config{})
+	if m.Delim != "a" || m.Glue != "a" || m.Prefix != "a" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
new file mode 100644
index 000000000..8c5612b96
--- /dev/null
+++ b/plugins/resource/subcommands.go
@@ -0,0 +1,83 @@
+package resource
+
+import (
+	"errors"
+	"fmt"
+	"github.com/dokku/dokku/plugins/common"
+)
+
+// CommandLimit implements resource:limit
+func CommandLimit(args []string, processType string, r Resource) (err error) {
+	return setRequestType(args, processType, r, "limit")
+}
+
+// CommandReserve implements resource:reserve
+func CommandReserve(args []string, processType string, r Resource) (err error) {
+	return setRequestType(args, processType, r, "reserve")
+}
+
+func setRequestType(args []string, processType string, r Resource, requestType string) (err error) {
+	var appName string
+	appName, err = getAppName(args)
+	if err != nil {
+		return
+	}
+
+	if err = common.VerifyAppName(appName); err != nil {
+		common.LogFail(err.Error())
+	}
+
+	if len(processType) == 0 {
+		processType = "_all_"
+	}
+
+	resources := map[string]string{
+		"cpu":             r.Cpu,
+		"memory":          r.Memory,
+		"memory-swap":     r.MemorySwap,
+		"network":         r.Network,
+		"network-ingress": r.NetworkIngress,
+		"network-egress":  r.NetworkEgress,
+	}
+
+	hasValues := false
+	for _, value := range resources {
+		if value != "" {
+			hasValues = true
+		}
+	}
+
+	if !hasValues {
+		return errors.New("Please specify a resource to modify")
+	}
+
+	if requestType == "limit" {
+		common.LogInfo2Quiet(fmt.Sprintf("Setting resource limits for %v", appName))
+	} else if requestType == "reserve" {
+		common.LogInfo2Quiet(fmt.Sprintf("Setting resource reservation for %v", appName))
+	}
+
+	for key, value := range resources {
+		if value != "" {
+			common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
+		}
+
+		property := fmt.Sprintf("%v.%v.%v", processType, requestType, key)
+		err = common.PropertyWrite(PluginName, appName, property, value)
+		if err != nil {
+			return
+		}
+	}
+
+	return
+}
+
+func getAppName(args []string) (appName string, err error) {
+	if len(args) >= 1 {
+		appName = args[0]
+	} else {
+		err = errors.New("Please specify an app to run the command on")
+	}
+
+	return
+}
diff --git a/plugins/resource/vendor/github.com/ryanuber/columnize/.travis.yml b/plugins/resource/vendor/github.com/ryanuber/columnize/.travis.yml
new file mode 100644
index 000000000..1a0bbea6c
--- /dev/null
+++ b/plugins/resource/vendor/github.com/ryanuber/columnize/.travis.yml
@@ -0,0 +1,3 @@
+language: go
+go:
+  - tip
diff --git a/plugins/resource/vendor/github.com/ryanuber/columnize/LICENSE b/plugins/resource/vendor/github.com/ryanuber/columnize/LICENSE
new file mode 100644
index 000000000..b9c0e2b68
--- /dev/null
+++ b/plugins/resource/vendor/github.com/ryanuber/columnize/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2016 Ryan Uber
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/resource/vendor/github.com/ryanuber/columnize/README.md b/plugins/resource/vendor/github.com/ryanuber/columnize/README.md
new file mode 100644
index 000000000..e47634fc6
--- /dev/null
+++ b/plugins/resource/vendor/github.com/ryanuber/columnize/README.md
@@ -0,0 +1,69 @@
+Columnize
+=========
+
+Easy column-formatted output for golang
+
+[![Build Status](https://travis-ci.org/ryanuber/columnize.svg)](https://travis-ci.org/ryanuber/columnize)
+[![GoDoc](https://godoc.org/github.com/ryanuber/columnize?status.svg)](https://godoc.org/github.com/ryanuber/columnize)
+
+Columnize is a really small Go package that makes building CLI's a little bit
+easier. In some CLI designs, you want to output a number similar items in a
+human-readable way with nicely aligned columns. However, figuring out how wide
+to make each column is a boring problem to solve and eats your valuable time.
+
+Here is an example:
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ryanuber/columnize"
+)
+
+func main() {
+    output := []string{
+        "Name | Gender | Age",
+        "Bob | Male | 38",
+        "Sally | Female | 26",
+    }
+    result := columnize.SimpleFormat(output)
+    fmt.Println(result)
+}
+```
+
+As you can see, you just pass in a list of strings. And the result:
+
+```
+Name   Gender  Age
+Bob    Male    38
+Sally  Female  26
+```
+
+Columnize is tolerant of missing or empty fields, or even empty lines, so
+passing in extra lines for spacing should show up as you would expect.
+
+Configuration
+=============
+
+Columnize is configured using a `Config`, which can be obtained by calling the
+`DefaultConfig()` method. You can then tweak the settings in the resulting
+`Config`:
+
+```
+config := columnize.DefaultConfig()
+config.Delim = "|"
+config.Glue = "  "
+config.Prefix = ""
+config.Empty = ""
+```
+
+* `Delim` is the string by which columns of **input** are delimited
+* `Glue` is the string by which columns of **output** are delimited
+* `Prefix` is a string by which each line of **output** is prefixed
+* `Empty` is a string used to replace blank values found in output
+
+You can then pass the `Config` in using the `Format` method (signature below) to
+have text formatted to your liking.
+
+See the [godoc](https://godoc.org/github.com/ryanuber/columnize) page for usage.
diff --git a/plugins/resource/vendor/github.com/ryanuber/columnize/columnize.go b/plugins/resource/vendor/github.com/ryanuber/columnize/columnize.go
new file mode 100644
index 000000000..915716a10
--- /dev/null
+++ b/plugins/resource/vendor/github.com/ryanuber/columnize/columnize.go
@@ -0,0 +1,178 @@
+package columnize
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// Config can be used to tune certain parameters which affect the way
+// in which Columnize will format output text.
+type Config struct {
+	// The string by which the lines of input will be split.
+	Delim string
+
+	// The string by which columns of output will be separated.
+	Glue string
+
+	// The string by which columns of output will be prefixed.
+	Prefix string
+
+	// A replacement string to replace empty fields
+	Empty string
+}
+
+// DefaultConfig returns a *Config with default values.
+func DefaultConfig() *Config {
+	return &Config{
+		Delim:  "|",
+		Glue:   "  ",
+		Prefix: "",
+		Empty:  "",
+	}
+}
+
+// MergeConfig merges two config objects together and returns the resulting
+// configuration. Values from the right take precedence over the left side.
+func MergeConfig(a, b *Config) *Config {
+	var result Config = *a
+
+	// Return quickly if either side was nil
+	if a == nil || b == nil {
+		return &result
+	}
+
+	if b.Delim != "" {
+		result.Delim = b.Delim
+	}
+	if b.Glue != "" {
+		result.Glue = b.Glue
+	}
+	if b.Prefix != "" {
+		result.Prefix = b.Prefix
+	}
+	if b.Empty != "" {
+		result.Empty = b.Empty
+	}
+
+	return &result
+}
+
+// stringFormat, given a set of column widths and the number of columns in
+// the current line, returns a sprintf-style format string which can be used
+// to print output aligned properly with other lines using the same widths set.
+func stringFormat(c *Config, widths []int, columns int) string {
+	// Create the buffer with an estimate of the length
+	buf := bytes.NewBuffer(make([]byte, 0, (6+len(c.Glue))*columns))
+
+	// Start with the prefix, if any was given. The buffer will not return an
+	// error so it does not need to be handled
+	buf.WriteString(c.Prefix)
+
+	// Create the format string from the discovered widths
+	for i := 0; i < columns && i < len(widths); i++ {
+		if i == columns-1 {
+			buf.WriteString("%s\n")
+		} else {
+			fmt.Fprintf(buf, "%%-%ds%s", widths[i], c.Glue)
+		}
+	}
+	return buf.String()
+}
+
+// elementsFromLine returns a list of elements, each representing a single
+// item which will belong to a column of output.
+func elementsFromLine(config *Config, line string) []interface{} {
+	seperated := strings.Split(line, config.Delim)
+	elements := make([]interface{}, len(seperated))
+	for i, field := range seperated {
+		value := strings.TrimSpace(field)
+
+		// Apply the empty value, if configured.
+		if value == "" && config.Empty != "" {
+			value = config.Empty
+		}
+		elements[i] = value
+	}
+	return elements
+}
+
+// runeLen calculates the number of visible "characters" in a string
+func runeLen(s string) int {
+	l := 0
+	for _ = range s {
+		l++
+	}
+	return l
+}
+
+// widthsFromLines examines a list of strings and determines how wide each
+// column should be considering all of the elements that need to be printed
+// within it.
+func widthsFromLines(config *Config, lines []string) []int {
+	widths := make([]int, 0, 8)
+
+	for _, line := range lines {
+		elems := elementsFromLine(config, line)
+		for i := 0; i < len(elems); i++ {
+			l := runeLen(elems[i].(string))
+			if len(widths) <= i {
+				widths = append(widths, l)
+			} else if widths[i] < l {
+				widths[i] = l
+			}
+		}
+	}
+	return widths
+}
+
+// Format is the public-facing interface that takes a list of strings and
+// returns nicely aligned column-formatted text.
+func Format(lines []string, config *Config) string {
+	conf := MergeConfig(DefaultConfig(), config)
+	widths := widthsFromLines(conf, lines)
+
+	// Estimate the buffer size
+	glueSize := len(conf.Glue)
+	var size int
+	for _, w := range widths {
+		size += w + glueSize
+	}
+	size *= len(lines)
+
+	// Create the buffer
+	buf := bytes.NewBuffer(make([]byte, 0, size))
+
+	// Create a cache for the string formats
+	fmtCache := make(map[int]string, 16)
+
+	// Create the formatted output using the format string
+	for _, line := range lines {
+		elems := elementsFromLine(conf, line)
+
+		// Get the string format using cache
+		numElems := len(elems)
+		stringfmt, ok := fmtCache[numElems]
+		if !ok {
+			stringfmt = stringFormat(conf, widths, numElems)
+			fmtCache[numElems] = stringfmt
+		}
+
+		fmt.Fprintf(buf, stringfmt, elems...)
+	}
+
+	// Get the string result
+	result := buf.String()
+
+	// Remove trailing newline without removing leading/trailing space
+	if n := len(result); n > 0 && result[n-1] == '\n' {
+		result = result[:n-1]
+	}
+
+	return result
+}
+
+// SimpleFormat is a convenience function to format text with the defaults.
+func SimpleFormat(lines []string) string {
+	return Format(lines, nil)
+}
diff --git a/plugins/resource/vendor/github.com/ryanuber/columnize/columnize_test.go b/plugins/resource/vendor/github.com/ryanuber/columnize/columnize_test.go
new file mode 100644
index 000000000..89dabaa38
--- /dev/null
+++ b/plugins/resource/vendor/github.com/ryanuber/columnize/columnize_test.go
@@ -0,0 +1,306 @@
+package columnize
+
+import (
+	"fmt"
+	"testing"
+
+	crand "crypto/rand"
+)
+
+func TestListOfStringsInput(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyLinesOutput(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestLeadingSpacePreserved(t *testing.T) {
+	input := []string{
+		"| Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "   Column B  Column C\n"
+	expected += "x  y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestColumnWidthCalculator(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"Longer than A | Longer than B | Longer than C",
+		"short | short | short",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A       Column B       Column C\n"
+	expected += "Longer than A  Longer than B  Longer than C\n"
+	expected += "short          short          short"
+
+	if output != expected {
+		printableProof := fmt.Sprintf("\nGot:      %+q", output)
+		printableProof += fmt.Sprintf("\nExpected: %+q", expected)
+		t.Fatalf("\n%s", printableProof)
+	}
+}
+
+func TestColumnWidthCalculatorNonASCII(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"⌘⌘⌘⌘⌘⌘⌘⌘ | Longer than B | Longer than C",
+		"short | short | short",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B       Column C\n"
+	expected += "⌘⌘⌘⌘⌘⌘⌘⌘  Longer than B  Longer than C\n"
+	expected += "short     short          short"
+
+	if output != expected {
+		printableProof := fmt.Sprintf("\nGot:      %+q", output)
+		printableProof += fmt.Sprintf("\nExpected: %+q", expected)
+		t.Fatalf("\n%s", printableProof)
+	}
+}
+
+func BenchmarkColumnWidthCalculator(b *testing.B) {
+	// Generate the input
+	input := []string{
+		"UUID A | UUID B | UUID C | Column D | Column E",
+	}
+
+	format := "%s|%s|%s|%s"
+	short := "short"
+
+	uuid := func() string {
+		buf := make([]byte, 16)
+		if _, err := crand.Read(buf); err != nil {
+			panic(fmt.Errorf("failed to read random bytes: %v", err))
+		}
+
+		return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
+			buf[0:4],
+			buf[4:6],
+			buf[6:8],
+			buf[8:10],
+			buf[10:16])
+	}
+
+	for i := 0; i < 1000; i++ {
+		l := fmt.Sprintf(format, uuid()[:8], uuid()[:12], uuid(), short, short)
+		input = append(input, l)
+	}
+
+	config := DefaultConfig()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		Format(input, config)
+	}
+}
+
+func TestVariedInputSpacing(t *testing.T) {
+	input := []string{
+		"Column A       |Column B|    Column C",
+		"x|y|          z",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestUnmatchedColumnCounts(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"Value A | Value B",
+		"Value A | Value B | Value C | Value D",
+	}
+
+	config := DefaultConfig()
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "Value A   Value B\n"
+	expected += "Value A   Value B   Value C   Value D"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternateDelimiter(t *testing.T) {
+	input := []string{
+		"Column | A % Column | B % Column | C",
+		"Value A % Value B % Value C",
+	}
+
+	config := DefaultConfig()
+	config.Delim = "%"
+	output := Format(input, config)
+
+	expected := "Column | A  Column | B  Column | C\n"
+	expected += "Value A     Value B     Value C"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternateSpacingString(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	config.Glue = "    "
+	output := Format(input, config)
+
+	expected := "Column A    Column B    Column C\n"
+	expected += "x           y           z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestSimpleFormat(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	output := SimpleFormat(input)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestAlternatePrefixString(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := DefaultConfig()
+	config.Prefix = "  "
+	output := Format(input, config)
+
+	expected := "  Column A  Column B  Column C\n"
+	expected += "  x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyFieldReplacement(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | | z",
+	}
+
+	config := DefaultConfig()
+	config.Empty = "<none>"
+	output := Format(input, config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         <none>    z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestEmptyConfigValues(t *testing.T) {
+	input := []string{
+		"Column A | Column B | Column C",
+		"x | y | z",
+	}
+
+	config := Config{}
+	output := Format(input, &config)
+
+	expected := "Column A  Column B  Column C\n"
+	expected += "x         y         z"
+
+	if output != expected {
+		t.Fatalf("\nexpected:\n%s\n\ngot:\n%s", expected, output)
+	}
+}
+
+func TestMergeConfig(t *testing.T) {
+	conf1 := &Config{Delim: "a", Glue: "a", Prefix: "a", Empty: "a"}
+	conf2 := &Config{Delim: "b", Glue: "b", Prefix: "b", Empty: "b"}
+	conf3 := &Config{Delim: "c", Prefix: "c"}
+
+	m := MergeConfig(conf1, conf2)
+	if m.Delim != "b" || m.Glue != "b" || m.Prefix != "b" || m.Empty != "b" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, conf3)
+	if m.Delim != "c" || m.Glue != "a" || m.Prefix != "c" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, nil)
+	if m.Delim != "a" || m.Glue != "a" || m.Prefix != "a" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+
+	m = MergeConfig(conf1, &Config{})
+	if m.Delim != "a" || m.Glue != "a" || m.Prefix != "a" || m.Empty != "a" {
+		t.Fatalf("bad: %#v", m)
+	}
+}

From 49e44ce59b1c5325fb3575c3ca434d59dd8dcd31 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 17:57:25 -0400
Subject: [PATCH 008/163] fix: correct stickler-ci issues

---
 plugins/resource/resource.go                        | 5 ++---
 plugins/resource/src/subcommands/limit/limit.go     | 2 +-
 plugins/resource/src/subcommands/reserve/reserve.go | 2 +-
 plugins/resource/subcommands.go                     | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index f782c52a2..90c286d50 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -1,12 +1,11 @@
 package resource
 
+// A collection of resource constraints for apps
 type Resource struct {
-	Cpu            string `json:"cpu"`
+	CPU            string `json:"cpu"`
 	Memory         string `json:"memory"`
 	MemorySwap     string `json:"memory-swap"`
 	Network        string `json:"network"`
 	NetworkIngress string `json:"network-ingress"`
 	NetworkEgress  string `json:"network-egress"`
 }
-
-const PluginName = "resource"
diff --git a/plugins/resource/src/subcommands/limit/limit.go b/plugins/resource/src/subcommands/limit/limit.go
index f8256d709..7046b637a 100644
--- a/plugins/resource/src/subcommands/limit/limit.go
+++ b/plugins/resource/src/subcommands/limit/limit.go
@@ -20,7 +20,7 @@ func main() {
 	args.Parse(os.Args[2:])
 
 	resources := resource.Resource{
-		Cpu:            *cpu,
+		CPU:            *cpu,
 		Memory:         *memory,
 		MemorySwap:     *memorySwap,
 		Network:        *network,
diff --git a/plugins/resource/src/subcommands/reserve/reserve.go b/plugins/resource/src/subcommands/reserve/reserve.go
index f76167b39..579abd5ca 100644
--- a/plugins/resource/src/subcommands/reserve/reserve.go
+++ b/plugins/resource/src/subcommands/reserve/reserve.go
@@ -20,7 +20,7 @@ func main() {
 	args.Parse(os.Args[2:])
 
 	resources := resource.Resource{
-		Cpu:            *cpu,
+		CPU:            *cpu,
 		Memory:         *memory,
 		MemorySwap:     *memorySwap,
 		Network:        *network,
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 8c5612b96..b53cc95b9 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -32,7 +32,7 @@ func setRequestType(args []string, processType string, r Resource, requestType s
 	}
 
 	resources := map[string]string{
-		"cpu":             r.Cpu,
+		"cpu":             r.CPU,
 		"memory":          r.Memory,
 		"memory-swap":     r.MemorySwap,
 		"network":         r.Network,
@@ -63,7 +63,7 @@ func setRequestType(args []string, processType string, r Resource, requestType s
 		}
 
 		property := fmt.Sprintf("%v.%v.%v", processType, requestType, key)
-		err = common.PropertyWrite(PluginName, appName, property, value)
+		err = common.PropertyWrite("resource", appName, property, value)
 		if err != nil {
 			return
 		}

From ff35e9592459566fb6c8cd5c5fb0be5b8d3c2cb3 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 17:58:32 -0400
Subject: [PATCH 009/163] fix: correct type comment declaration

---
 plugins/resource/resource.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index 90c286d50..1f188893a 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -1,6 +1,6 @@
 package resource
 
-// A collection of resource constraints for apps
+// Resource is a collection of resource constraints for apps
 type Resource struct {
 	CPU            string `json:"cpu"`
 	Memory         string `json:"memory"`

From b36ab54b87abbd80e2b9faf06eec4df9e22c7579 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 18:21:33 -0400
Subject: [PATCH 010/163] fix: correct variable name

---
 plugins/resource/src/subcommands/limit/limit.go     | 4 ++--
 plugins/resource/src/subcommands/reserve/reserve.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/resource/src/subcommands/limit/limit.go b/plugins/resource/src/subcommands/limit/limit.go
index 7046b637a..d45438e3a 100644
--- a/plugins/resource/src/subcommands/limit/limit.go
+++ b/plugins/resource/src/subcommands/limit/limit.go
@@ -10,7 +10,7 @@ import (
 
 func main() {
 	args := flag.NewFlagSet("resource:limit", flag.ExitOnError)
-	processeType := args.String("process-type", "", "process-type: A process type to manage")
+	processType := args.String("process-type", "", "process-type: A process type to manage")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
 	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
@@ -28,7 +28,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandLimit(args.Args(), *processeType, resources)
+	err := resource.CommandLimit(args.Args(), *processType, resources)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/reserve/reserve.go b/plugins/resource/src/subcommands/reserve/reserve.go
index 579abd5ca..afeccb551 100644
--- a/plugins/resource/src/subcommands/reserve/reserve.go
+++ b/plugins/resource/src/subcommands/reserve/reserve.go
@@ -10,7 +10,7 @@ import (
 
 func main() {
 	args := flag.NewFlagSet("resource:reserve", flag.ExitOnError)
-	processeType := args.String("process-type", "", "process-type: A process type to manage")
+	processType := args.String("process-type", "", "process-type: A process type to manage")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
 	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
@@ -28,7 +28,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandReserve(args.Args(), *processeType, resources)
+	err := resource.CommandReserve(args.Args(), *processType, resources)
 	if err != nil {
 		common.LogFail(err.Error())
 	}

From 9808ecde811269f612edd819cb402d80123617a1 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 19:57:17 -0400
Subject: [PATCH 011/163] feat: implement default limit management

Also add generic report information when no flags are specified
---
 docs/advanced-usage/resource-management.md    | 72 ++++++++++++--
 plugins/resource/Makefile                     |  2 +-
 plugins/resource/src/commands/commands.go     |  2 +
 .../limit-defaults/limit-defaults.go          | 35 +++++++
 .../reserve-defaults/reserve-defaults.go      | 35 +++++++
 plugins/resource/subcommands.go               | 95 ++++++++++++++++---
 6 files changed, 215 insertions(+), 26 deletions(-)
 create mode 100644 plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
 create mode 100644 plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 91a9bc9c4..a646a303c 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -3,12 +3,12 @@
 > New as of 0.15.0
 
 ```
-dokku resource:limit --process-type <process-type,...> [RESOURCE_OPTS...] <app>
-dokku resource:reserve --process-type <process-type,...> [RESOURCE_OPTS...] <app>
-dokku resource:limit-defaults [RESOURCE_OPTS...]
-dokku resource:reserve-defaults [RESOURCE_OPTS...]
-dokku resource:limit-clear [<app>]
-dokku resource:reserve-clear [<app>]
+dokku resource:limit [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
+dokku resource:reserve [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
+dokku resource:limit-defaults [--process-type <process-type,...>] [RESOURCE_OPTS...]
+dokku resource:reserve-defaults [--process-type <process-type,...>] [RESOURCE_OPTS...]
+dokku resource:limit-clear [--process-type <process-type,...>] [<app>]
+dokku resource:reserve-clear [--process-type <process-type,...>] [<app>]
 dokku resource:report [<app>]
 ```
 
@@ -68,17 +68,43 @@ dokku resource:limit --cpu 100 --memory 100 --process-type worker node-js-app
        memory: 100
 ```
 
+Running the `resource:limits` command without any flags will display the currently configured app reservation.
+
+```shell
+dokku resource:limits node-js-app
+=====> resource limits node-js-app information
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
 #### Default Resource Limits
 
 By default, Dokku does not limit any resources, though these can be specified at the server level via the `resource:limit-defaults` command. As with the `resource:limit` command, any and all resource request types can be specified.
 
 ```shell
-dokku resource:limit-defaults --memory 100
+dokku resource:limit-defaults --memory 200
 ```
 
 ```
 =====> Setting default resource limits
-       memory: 100
+       memory: 200
+```
+
+Running the `resource:limit-defaults` command without any flags will display the currently configured default limits.
+
+```shell
+dokku resource:limit-defaults
+=====> resource limits default information
+       cpu:
+       memory: 200
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
 ```
 
 ### Clearing Resource Limits
@@ -142,17 +168,43 @@ dokku resource:reserve --cpu 100 --memory 100 --process-type worker node-js-app
        memory: 100
 ```
 
+Running the `resource:reserve` command without any flags will display the currently configured app reservation.
+
+```shell
+dokku resource:reserve node-js-app
+=====> resource reservation node-js-app information
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
 #### Default Resource Reservations
 
 By default, Dokku does not reserve any resources, though these can be specified at the server level via the `resource:reserve-defaults` command. As with the `resource:reserve` command, any and all resource request types can be specified.
 
 ```shell
-dokku resource:reserve-defaults --memory 100
+dokku resource:reserve-defaults --memory 200
 ```
 
 ```
 =====> Setting default resource reservation
-       memory: 100
+       memory: 200
+```
+
+Running the `resource:reserve-defaults` command without any flags will display the currently configured default reservation.
+
+```shell
+dokku resource:reserve-defaults
+=====> resource reservation default information
+       cpu:
+       memory: 200
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
 ```
 
 #### Clearing Resource Reservations
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index fde0627dd..dca4586ed 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -2,7 +2,7 @@ include ../../common.mk
 
 GO_ARGS ?= -a
 
-SUBCOMMANDS = subcommands/limit subcommands/reserve
+SUBCOMMANDS = subcommands/limit subcommands/limit-defaults subcommands/reserve subcommands/reserve-defaults
 TRIGGERS = triggers/install triggers/post-delete
 build-in-docker: clean
 	docker run --rm \
diff --git a/plugins/resource/src/commands/commands.go b/plugins/resource/src/commands/commands.go
index 3a13ddf6e..0387b7735 100644
--- a/plugins/resource/src/commands/commands.go
+++ b/plugins/resource/src/commands/commands.go
@@ -21,6 +21,8 @@ Additional commands:`
 	helpContent = `
     resource:limit [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
     resource:reserve [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
+    resource:limit-defaults [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
+    resource:reserve-defaults [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
 `
 )
 
diff --git a/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go b/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
new file mode 100644
index 000000000..9efaa8c0e
--- /dev/null
+++ b/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:limit-defaults", flag.ExitOnError)
+	processType := args.String("process-type", "", "process-type: A process type to manage")
+	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
+	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
+	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
+	network := args.String("network", "", "network: The amount of network bandwidth to limit processes by")
+	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to limit processes by")
+	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to limit processes by")
+	args.Parse(os.Args[2:])
+
+	resources := resource.Resource{
+		CPU:            *cpu,
+		Memory:         *memory,
+		MemorySwap:     *memorySwap,
+		Network:        *network,
+		NetworkIngress: *networkIngress,
+		NetworkEgress:  *networkEgress,
+	}
+
+	err := resource.CommandLimitDefaults(args.Args(), *processType, resources)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go b/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go
new file mode 100644
index 000000000..f7edb412a
--- /dev/null
+++ b/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:reserve-defaults", flag.ExitOnError)
+	processType := args.String("process-type", "", "process-type: A process type to manage")
+	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
+	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
+	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
+	network := args.String("network", "", "network: The amount of network bandwidth to reserve for processes")
+	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to reserve for processes")
+	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to reserve for processes")
+	args.Parse(os.Args[2:])
+
+	resources := resource.Resource{
+		CPU:            *cpu,
+		Memory:         *memory,
+		MemorySwap:     *memorySwap,
+		Network:        *network,
+		NetworkIngress: *networkIngress,
+		NetworkEgress:  *networkEgress,
+	}
+
+	err := resource.CommandReserveDefaults(args.Args(), *processType, resources)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index b53cc95b9..df014668f 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -8,15 +8,6 @@ import (
 
 // CommandLimit implements resource:limit
 func CommandLimit(args []string, processType string, r Resource) (err error) {
-	return setRequestType(args, processType, r, "limit")
-}
-
-// CommandReserve implements resource:reserve
-func CommandReserve(args []string, processType string, r Resource) (err error) {
-	return setRequestType(args, processType, r, "reserve")
-}
-
-func setRequestType(args []string, processType string, r Resource, requestType string) (err error) {
 	var appName string
 	appName, err = getAppName(args)
 	if err != nil {
@@ -27,6 +18,35 @@ func setRequestType(args []string, processType string, r Resource, requestType s
 		common.LogFail(err.Error())
 	}
 
+	return setRequestType(appName, processType, r, "limit")
+}
+
+// CommandLimitDefaults implements resource:limit-defaults
+func CommandLimitDefaults(args []string, processType string, r Resource) (err error) {
+	return setRequestType("_all_", "", r, "limit")
+}
+
+// CommandReserve implements resource:reserve
+func CommandReserve(args []string, processType string, r Resource) (err error) {
+	var appName string
+	appName, err = getAppName(args)
+	if err != nil {
+		return
+	}
+
+	if err = common.VerifyAppName(appName); err != nil {
+		common.LogFail(err.Error())
+	}
+
+	return setRequestType(appName, processType, r, "reserve")
+}
+
+// CommandReserveDefaults implements resource:reserve-defaults
+func CommandReserveDefaults(args []string, processType string, r Resource) (err error) {
+	return setRequestType("_all_", "", r, "reserve")
+}
+
+func setRequestType(appName string, processType string, r Resource, requestType string) (err error) {
 	if len(processType) == 0 {
 		processType = "_all_"
 	}
@@ -48,21 +68,29 @@ func setRequestType(args []string, processType string, r Resource, requestType s
 	}
 
 	if !hasValues {
-		return errors.New("Please specify a resource to modify")
+		return reportRequestType(appName, processType, requestType)
 	}
 
-	if requestType == "limit" {
-		common.LogInfo2Quiet(fmt.Sprintf("Setting resource limits for %v", appName))
-	} else if requestType == "reserve" {
-		common.LogInfo2Quiet(fmt.Sprintf("Setting resource reservation for %v", appName))
+	noun := "limits"
+	if requestType == "reserve" {
+		noun = "reservation"
 	}
+	message := fmt.Sprintf("Setting resource %v for %v", noun, appName)
+	if appName == "_all_" {
+		message = fmt.Sprintf("Setting default resource %v", noun)
+	}
+
+	if processType != "_all_" {
+		message = fmt.Sprintf("%v (%v)", message, processType)
+	}
+	common.LogInfo2Quiet(message)
 
 	for key, value := range resources {
 		if value != "" {
 			common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
 		}
 
-		property := fmt.Sprintf("%v.%v.%v", processType, requestType, key)
+		property := propertyKey(processType, requestType, key)
 		err = common.PropertyWrite("resource", appName, property, value)
 		if err != nil {
 			return
@@ -72,6 +100,43 @@ func setRequestType(args []string, processType string, r Resource, requestType s
 	return
 }
 
+func reportRequestType(appName string, processType string, requestType string) (err error) {
+	noun := "limits"
+	if requestType == "reserve" {
+		noun = "reservation"
+	}
+
+	humanAppName := appName
+	if appName == "_all_" {
+		humanAppName = "default"
+	}
+	message := fmt.Sprintf("resource %v %v information", noun, humanAppName)
+	if processType != "_all_" {
+		message = fmt.Sprintf("%v (%v)", message, processType)
+	}
+	common.LogInfo2Quiet(message)
+
+	resources := map[string]bool{
+		"cpu":             true,
+		"memory":          true,
+		"memory-swap":     true,
+		"network":         true,
+		"network-ingress": true,
+		"network-egress":  true,
+	}
+
+	for key, _ := range resources {
+		property := propertyKey(processType, requestType, key)
+		value := common.PropertyGet("resource", appName, property)
+		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
+	}
+	return nil
+}
+
+func propertyKey(processType string, requestType string, key string) string {
+	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
+}
+
 func getAppName(args []string) (appName string, err error) {
 	if len(args) >= 1 {
 		appName = args[0]

From bdfde9a481aa8b6311c93aaebdba910fec5fdef2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 20:06:48 -0400
Subject: [PATCH 012/163] feat: initial stub implementation for
 resource:*-clear commands

---
 plugins/resource/Makefile                     |  2 +-
 .../subcommands/limit-clear/limit-clear.go    | 20 +++++++++++++++++++
 .../reserve-clear/reserve-clear.go            | 20 +++++++++++++++++++
 plugins/resource/subcommands.go               | 10 ++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 plugins/resource/src/subcommands/limit-clear/limit-clear.go
 create mode 100644 plugins/resource/src/subcommands/reserve-clear/reserve-clear.go

diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index dca4586ed..783f03f82 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -2,7 +2,7 @@ include ../../common.mk
 
 GO_ARGS ?= -a
 
-SUBCOMMANDS = subcommands/limit subcommands/limit-defaults subcommands/reserve subcommands/reserve-defaults
+SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/limit-defaults subcommands/reserve subcommands/reserve-clear subcommands/reserve-defaults
 TRIGGERS = triggers/install triggers/post-delete
 build-in-docker: clean
 	docker run --rm \
diff --git a/plugins/resource/src/subcommands/limit-clear/limit-clear.go b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
new file mode 100644
index 000000000..b794dfc30
--- /dev/null
+++ b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:limit-clear", flag.ExitOnError)
+	processType := args.String("process-type", "", "process-type: A process type to clear")
+	args.Parse(os.Args[2:])
+
+	err := resource.CommandLimitClear(args.Args(), *processType)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
new file mode 100644
index 000000000..4f882388d
--- /dev/null
+++ b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+func main() {
+	args := flag.NewFlagSet("resource:reserve-clear", flag.ExitOnError)
+	processType := args.String("process-type", "", "process-type: A process type to clear")
+	args.Parse(os.Args[2:])
+
+	err := resource.CommandReserveClear(args.Args(), *processType)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index df014668f..9ee9271f2 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -21,6 +21,11 @@ func CommandLimit(args []string, processType string, r Resource) (err error) {
 	return setRequestType(appName, processType, r, "limit")
 }
 
+// CommandLimitClear implements resource:limit-clear
+func CommandLimitClear(args []string, processType string) (err error) {
+	return nil
+}
+
 // CommandLimitDefaults implements resource:limit-defaults
 func CommandLimitDefaults(args []string, processType string, r Resource) (err error) {
 	return setRequestType("_all_", "", r, "limit")
@@ -41,6 +46,11 @@ func CommandReserve(args []string, processType string, r Resource) (err error) {
 	return setRequestType(appName, processType, r, "reserve")
 }
 
+// CommandReserveClear implements resource:reserve-clear
+func CommandReserveClear(args []string, processType string) (err error) {
+	return nil
+}
+
 // CommandReserveDefaults implements resource:reserve-defaults
 func CommandReserveDefaults(args []string, processType string, r Resource) (err error) {
 	return setRequestType("_all_", "", r, "reserve")

From 04a6e30e457920631c4d64c2551698e4e60e1658 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 20:53:38 -0400
Subject: [PATCH 013/163] refactor: drop `-defaults` command in favor of
 --global flag

This makes usage a bit simpler, at the cost of interface complexity.
---
 docs/advanced-usage/resource-management.md    | 96 ++++++++++++++++---
 plugins/resource/Makefile                     |  2 +-
 plugins/resource/src/commands/commands.go     |  6 +-
 .../subcommands/limit-clear/limit-clear.go    |  3 +-
 .../limit-defaults/limit-defaults.go          | 35 -------
 .../resource/src/subcommands/limit/limit.go   |  3 +-
 .../reserve-clear/reserve-clear.go            |  3 +-
 .../reserve-defaults/reserve-defaults.go      | 35 -------
 .../src/subcommands/reserve/reserve.go        |  3 +-
 plugins/resource/subcommands.go               | 50 +++++-----
 10 files changed, 114 insertions(+), 122 deletions(-)
 delete mode 100644 plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
 delete mode 100644 plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index a646a303c..7725cefec 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -3,10 +3,8 @@
 > New as of 0.15.0
 
 ```
-dokku resource:limit [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
-dokku resource:reserve [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
-dokku resource:limit-defaults [--process-type <process-type,...>] [RESOURCE_OPTS...]
-dokku resource:reserve-defaults [--process-type <process-type,...>] [RESOURCE_OPTS...]
+dokku resource:limit [--global] [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
+dokku resource:reserve [--global] [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
 dokku resource:limit-clear [--process-type <process-type,...>] [<app>]
 dokku resource:reserve-clear [--process-type <process-type,...>] [<app>]
 dokku resource:report [<app>]
@@ -68,6 +66,8 @@ dokku resource:limit --cpu 100 --memory 100 --process-type worker node-js-app
        memory: 100
 ```
 
+#### Displaying Resource Limits
+
 Running the `resource:limits` command without any flags will display the currently configured app reservation.
 
 ```shell
@@ -81,12 +81,12 @@ dokku resource:limits node-js-app
        network-egress:
 ```
 
-#### Default Resource Limits
+#### Global Resource Limits
 
-By default, Dokku does not limit any resources, though these can be specified at the server level via the `resource:limit-defaults` command. As with the `resource:limit` command, any and all resource request types can be specified.
+By default, Dokku does not limit any resources, though these can be specified at the server level via the `--global` flag on the `resource:limit` command.
 
 ```shell
-dokku resource:limit-defaults --memory 200
+dokku resource:limit --global --memory 200
 ```
 
 ```
@@ -94,10 +94,26 @@ dokku resource:limit-defaults --memory 200
        memory: 200
 ```
 
-Running the `resource:limit-defaults` command without any flags will display the currently configured default limits.
+This may also be combined with the `--process-type` flag to set global limits on a process-type level:
 
 ```shell
-dokku resource:limit-defaults
+dokku resource:limit --global --memory 150 --process-type web node-js-app
+```
+
+```
+=====> Setting default resource limits (web)
+       memory: 150
+```
+
+#### Displaying Global Resource Limits
+
+Running the `resource:limit` command with only the `--global` flag will display the currently configured default limits.
+
+```shell
+dokku resource:limit --global
+```
+
+```
 =====> resource limits default information
        cpu:
        memory: 200
@@ -107,7 +123,23 @@ dokku resource:limit-defaults
        network-egress:
 ```
 
-### Clearing Resource Limits
+This may also be combined with the `--process-type` flag to see global limits on a process-type level:
+
+```shell
+dokku resource:limit --global --process-type web
+```
+
+```
+=====> resource limits default information (web)
+       cpu:
+       memory-swap:
+       memory: 150
+       network-egress:
+       network-ingress:
+       network:
+```
+
+#### Clearing Resource Limits
 
 In cases where the values are incorrect - or there is no desire to limit resources - resource limits may be cleared using the `resource:limit-clear` command.
 
@@ -168,6 +200,8 @@ dokku resource:reserve --cpu 100 --memory 100 --process-type worker node-js-app
        memory: 100
 ```
 
+#### Displaying Resource Reservations
+
 Running the `resource:reserve` command without any flags will display the currently configured app reservation.
 
 ```shell
@@ -181,12 +215,12 @@ dokku resource:reserve node-js-app
        network-egress:
 ```
 
-#### Default Resource Reservations
+#### Global Resource Reservations
 
-By default, Dokku does not reserve any resources, though these can be specified at the server level via the `resource:reserve-defaults` command. As with the `resource:reserve` command, any and all resource request types can be specified.
+By default, Dokku does not reserve any resources, though these can be specified at the server level via the `--global` flag on the `resource:reserve` command.
 
 ```shell
-dokku resource:reserve-defaults --memory 200
+dokku resource:reserve --global --memory 200
 ```
 
 ```
@@ -194,10 +228,26 @@ dokku resource:reserve-defaults --memory 200
        memory: 200
 ```
 
-Running the `resource:reserve-defaults` command without any flags will display the currently configured default reservation.
+This may also be combined with the `--process-type` flag to set global reservations on a process-type level:
 
 ```shell
-dokku resource:reserve-defaults
+dokku resource:reserve --global --memory 150 --process-type web node-js-app
+```
+
+```
+=====> Setting default resource reservation (web)
+       memory: 150
+```
+
+#### Displaying Global Resource Reservations
+
+Running the `resource:reserve` command with only the `--global` flag will display the currently configured default reservation.
+
+```shell
+dokku resource:reserve --global
+```
+
+```
 =====> resource reservation default information
        cpu:
        memory: 200
@@ -207,6 +257,22 @@ dokku resource:reserve-defaults
        network-egress:
 ```
 
+This may also be combined with the `--process-type` flag to see global reservations on a process-type level:
+
+```shell
+dokku resource:reserve --global --process-type web
+```
+
+```
+=====> resource reservation default information (web)
+       cpu:
+       memory-swap:
+       memory: 150
+       network-egress:
+       network-ingress:
+       network:
+```
+
 #### Clearing Resource Reservations
 
 In cases where the values are incorrect - or there is no desire to reserve resources - resource reservations may be cleared using the `resource:reserve-clear` command.
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index 783f03f82..d2b724c7b 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -2,7 +2,7 @@ include ../../common.mk
 
 GO_ARGS ?= -a
 
-SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/limit-defaults subcommands/reserve subcommands/reserve-clear subcommands/reserve-defaults
+SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/reserve subcommands/reserve-clear
 TRIGGERS = triggers/install triggers/post-delete
 build-in-docker: clean
 	docker run --rm \
diff --git a/plugins/resource/src/commands/commands.go b/plugins/resource/src/commands/commands.go
index 0387b7735..5e13ed013 100644
--- a/plugins/resource/src/commands/commands.go
+++ b/plugins/resource/src/commands/commands.go
@@ -19,10 +19,8 @@ Manages resource settings for an app
 Additional commands:`
 
 	helpContent = `
-    resource:limit [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
-    resource:reserve [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
-    resource:limit-defaults [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
-    resource:reserve-defaults [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
+    resource:limit [--global] [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
+    resource:reserve [--global] [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
 `
 )
 
diff --git a/plugins/resource/src/subcommands/limit-clear/limit-clear.go b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
index b794dfc30..32000d6d6 100644
--- a/plugins/resource/src/subcommands/limit-clear/limit-clear.go
+++ b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
@@ -11,9 +11,10 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:limit-clear", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to clear")
+	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	args.Parse(os.Args[2:])
 
-	err := resource.CommandLimitClear(args.Args(), *processType)
+	err := resource.CommandLimitClear(args.Args(), *processType, *global)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go b/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
deleted file mode 100644
index 9efaa8c0e..000000000
--- a/plugins/resource/src/subcommands/limit-defaults/limit-defaults.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"flag"
-	"os"
-
-	"github.com/dokku/dokku/plugins/common"
-	"github.com/dokku/dokku/plugins/resource"
-)
-
-func main() {
-	args := flag.NewFlagSet("resource:limit-defaults", flag.ExitOnError)
-	processType := args.String("process-type", "", "process-type: A process type to manage")
-	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
-	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
-	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
-	network := args.String("network", "", "network: The amount of network bandwidth to limit processes by")
-	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to limit processes by")
-	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to limit processes by")
-	args.Parse(os.Args[2:])
-
-	resources := resource.Resource{
-		CPU:            *cpu,
-		Memory:         *memory,
-		MemorySwap:     *memorySwap,
-		Network:        *network,
-		NetworkIngress: *networkIngress,
-		NetworkEgress:  *networkEgress,
-	}
-
-	err := resource.CommandLimitDefaults(args.Args(), *processType, resources)
-	if err != nil {
-		common.LogFail(err.Error())
-	}
-}
diff --git a/plugins/resource/src/subcommands/limit/limit.go b/plugins/resource/src/subcommands/limit/limit.go
index d45438e3a..024835acd 100644
--- a/plugins/resource/src/subcommands/limit/limit.go
+++ b/plugins/resource/src/subcommands/limit/limit.go
@@ -11,6 +11,7 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:limit", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to manage")
+	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
 	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
@@ -28,7 +29,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandLimit(args.Args(), *processType, resources)
+	err := resource.CommandLimit(args.Args(), *processType, resources, *global)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
index 4f882388d..c27a02bba 100644
--- a/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
+++ b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
@@ -11,9 +11,10 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:reserve-clear", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to clear")
+	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	args.Parse(os.Args[2:])
 
-	err := resource.CommandReserveClear(args.Args(), *processType)
+	err := resource.CommandReserveClear(args.Args(), *processType, *global)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go b/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go
deleted file mode 100644
index f7edb412a..000000000
--- a/plugins/resource/src/subcommands/reserve-defaults/reserve-defaults.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"flag"
-	"os"
-
-	"github.com/dokku/dokku/plugins/common"
-	"github.com/dokku/dokku/plugins/resource"
-)
-
-func main() {
-	args := flag.NewFlagSet("resource:reserve-defaults", flag.ExitOnError)
-	processType := args.String("process-type", "", "process-type: A process type to manage")
-	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
-	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
-	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
-	network := args.String("network", "", "network: The amount of network bandwidth to reserve for processes")
-	networkIngress := args.String("network-ingress", "", "network-ingress: The amount of ingress network bandwidth to reserve for processes")
-	networkEgress := args.String("network-egress", "", "network-egress: The amount of egress network bandwidth to reserve for processes")
-	args.Parse(os.Args[2:])
-
-	resources := resource.Resource{
-		CPU:            *cpu,
-		Memory:         *memory,
-		MemorySwap:     *memorySwap,
-		Network:        *network,
-		NetworkIngress: *networkIngress,
-		NetworkEgress:  *networkEgress,
-	}
-
-	err := resource.CommandReserveDefaults(args.Args(), *processType, resources)
-	if err != nil {
-		common.LogFail(err.Error())
-	}
-}
diff --git a/plugins/resource/src/subcommands/reserve/reserve.go b/plugins/resource/src/subcommands/reserve/reserve.go
index afeccb551..a62a34d55 100644
--- a/plugins/resource/src/subcommands/reserve/reserve.go
+++ b/plugins/resource/src/subcommands/reserve/reserve.go
@@ -11,6 +11,7 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:reserve", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to manage")
+	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
 	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
@@ -28,7 +29,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandReserve(args.Args(), *processType, resources)
+	err := resource.CommandReserve(args.Args(), *processType, resources, *global)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 9ee9271f2..d93ebbd2d 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -7,55 +7,49 @@ import (
 )
 
 // CommandLimit implements resource:limit
-func CommandLimit(args []string, processType string, r Resource) (err error) {
-	var appName string
-	appName, err = getAppName(args)
-	if err != nil {
-		return
-	}
+func CommandLimit(args []string, processType string, r Resource, global bool) (err error) {
+	appName := "_all_"
+	if !global {
+		appName, err = getAppName(args)
+		if err != nil {
+			return
+		}
 
-	if err = common.VerifyAppName(appName); err != nil {
-		common.LogFail(err.Error())
+		if err = common.VerifyAppName(appName); err != nil {
+			common.LogFail(err.Error())
+		}
 	}
 
 	return setRequestType(appName, processType, r, "limit")
 }
 
 // CommandLimitClear implements resource:limit-clear
-func CommandLimitClear(args []string, processType string) (err error) {
+func CommandLimitClear(args []string, processType string, global bool) (err error) {
 	return nil
 }
 
-// CommandLimitDefaults implements resource:limit-defaults
-func CommandLimitDefaults(args []string, processType string, r Resource) (err error) {
-	return setRequestType("_all_", "", r, "limit")
-}
-
 // CommandReserve implements resource:reserve
-func CommandReserve(args []string, processType string, r Resource) (err error) {
-	var appName string
-	appName, err = getAppName(args)
-	if err != nil {
-		return
-	}
+func CommandReserve(args []string, processType string, r Resource, global bool) (err error) {
+	appName := "_all_"
+	if !global {
+		appName, err = getAppName(args)
+		if err != nil {
+			return
+		}
 
-	if err = common.VerifyAppName(appName); err != nil {
-		common.LogFail(err.Error())
+		if err = common.VerifyAppName(appName); err != nil {
+			common.LogFail(err.Error())
+		}
 	}
 
 	return setRequestType(appName, processType, r, "reserve")
 }
 
 // CommandReserveClear implements resource:reserve-clear
-func CommandReserveClear(args []string, processType string) (err error) {
+func CommandReserveClear(args []string, processType string, global bool) (err error) {
 	return nil
 }
 
-// CommandReserveDefaults implements resource:reserve-defaults
-func CommandReserveDefaults(args []string, processType string, r Resource) (err error) {
-	return setRequestType("_all_", "", r, "reserve")
-}
-
 func setRequestType(appName string, processType string, r Resource, requestType string) (err error) {
 	if len(processType) == 0 {
 		processType = "_all_"

From 8d2355683199d75d8820d8065e21d931a7020399 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 13 Mar 2019 21:39:56 -0400
Subject: [PATCH 014/163] fix: omit 2nd, unused value from range

---
 plugins/resource/subcommands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index d93ebbd2d..d783adeff 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -129,7 +129,7 @@ func reportRequestType(appName string, processType string, requestType string) (
 		"network-egress":  true,
 	}
 
-	for key, _ := range resources {
+	for key := range resources {
 		property := propertyKey(processType, requestType, key)
 		value := common.PropertyGet("resource", appName, property)
 		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))

From c5717510ee45a18af1c2941e828767efb7dcf92f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Mar 2019 12:36:37 -0400
Subject: [PATCH 015/163] feat: always get keys in order

Ranging over maps is unordered in golang, so we need to use the correct data structure if we need the output in an ordered way.
---
 plugins/resource/subcommands.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index d783adeff..444cc12b0 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -120,16 +120,16 @@ func reportRequestType(appName string, processType string, requestType string) (
 	}
 	common.LogInfo2Quiet(message)
 
-	resources := map[string]bool{
-		"cpu":             true,
-		"memory":          true,
-		"memory-swap":     true,
-		"network":         true,
-		"network-ingress": true,
-		"network-egress":  true,
+	resources := []string{
+		"cpu",
+		"memory",
+		"memory-swap",
+		"network",
+		"network-ingress",
+		"network-egress",
 	}
 
-	for key := range resources {
+	for _, key := range resources {
 		property := propertyKey(processType, requestType, key)
 		value := common.PropertyGet("resource", appName, property)
 		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))

From ab9f516c089fbaa4196d6bfce3f161124cd063ed Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Mar 2019 12:37:33 -0400
Subject: [PATCH 016/163] refactor: clean up duplication in retrieving and
 verifying the APP argument

---
 plugins/resource/subcommands.go | 46 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 444cc12b0..80631225f 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -8,16 +8,9 @@ import (
 
 // CommandLimit implements resource:limit
 func CommandLimit(args []string, processType string, r Resource, global bool) (err error) {
-	appName := "_all_"
-	if !global {
-		appName, err = getAppName(args)
-		if err != nil {
-			return
-		}
-
-		if err = common.VerifyAppName(appName); err != nil {
-			common.LogFail(err.Error())
-		}
+	appName, err = getAppName(args, global)
+	if err != nil {
+		return err
 	}
 
 	return setRequestType(appName, processType, r, "limit")
@@ -30,16 +23,9 @@ func CommandLimitClear(args []string, processType string, global bool) (err erro
 
 // CommandReserve implements resource:reserve
 func CommandReserve(args []string, processType string, r Resource, global bool) (err error) {
-	appName := "_all_"
-	if !global {
-		appName, err = getAppName(args)
-		if err != nil {
-			return
-		}
-
-		if err = common.VerifyAppName(appName); err != nil {
-			common.LogFail(err.Error())
-		}
+	appName, err = getAppName(args, global)
+	if err != nil {
+		return err
 	}
 
 	return setRequestType(appName, processType, r, "reserve")
@@ -141,12 +127,20 @@ func propertyKey(processType string, requestType string, key string) string {
 	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
 }
 
-func getAppName(args []string) (appName string, err error) {
-	if len(args) >= 1 {
-		appName = args[0]
-	} else {
-		err = errors.New("Please specify an app to run the command on")
+func getAppName(args []string, global bool) (appName string, err error) {
+	appName := "_all_"
+	if global {
+		return appName, nil
 	}
 
-	return
+	if len(args) < 1 {
+		return "", errors.New("Please specify an app to run the command on")
+	}
+
+	appName = args[0]
+	if err = common.VerifyAppName(appName); err != nil {
+		return "", err
+	}
+
+	return appName, nil
 }

From 9acb9e527d68bee5bac5d84f320b2e524d201163 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Mar 2019 12:38:59 -0400
Subject: [PATCH 017/163] feat: implement resource:*-clear commands

---
 plugins/resource/subcommands.go | 49 +++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 80631225f..edf9b4038 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -18,7 +18,12 @@ func CommandLimit(args []string, processType string, r Resource, global bool) (e
 
 // CommandLimitClear implements resource:limit-clear
 func CommandLimitClear(args []string, processType string, global bool) (err error) {
-	return nil
+	appName, err = getAppName(args, global)
+	if err != nil {
+		return err
+	}
+
+	return clearByRequestType(appName, processType, "limit")
 }
 
 // CommandReserve implements resource:reserve
@@ -32,7 +37,47 @@ func CommandReserve(args []string, processType string, r Resource, global bool)
 }
 
 // CommandReserveClear implements resource:reserve-clear
-func CommandReserveClear(args []string, processType string, global bool) (err error) {
+func CommandReserveClear(args []string, processType string, global bool) error {
+	appName, err = getAppName(args, global)
+	if err != nil {
+		return err
+	}
+
+	return clearByRequestType(appName, processType, "reserve")
+}
+
+func clearByRequestType(appName, processType, requestType) error {
+	noun := "limits"
+	if requestType == "reserve" {
+		noun = "reservation"
+	}
+
+	humanAppName := appName
+	if appName == "_all_" {
+		humanAppName = "default"
+	}
+	message := fmt.Sprintf("clearing %v %v", humanAppName, noun)
+	if processType != "_all_" {
+		message = fmt.Sprintf("%v (%v)", message, processType)
+	}
+	common.LogInfo2Quiet(message)
+
+	resources := []string{
+		"cpu",
+		"memory",
+		"memory-swap",
+		"network",
+		"network-ingress",
+		"network-egress",
+	}
+
+	for _, key := range resources {
+		property := propertyKey(processType, requestType, key)
+		err = common.PropertyDelete("resource", appName, property)
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

From 982895ff71f6b4b28f9cc921954b06ad6c2b849e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 15:30:44 -0400
Subject: [PATCH 018/163] fix: add missing argument

---
 plugins/resource/subcommands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index edf9b4038..cab48632a 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -46,7 +46,7 @@ func CommandReserveClear(args []string, processType string, global bool) error {
 	return clearByRequestType(appName, processType, "reserve")
 }
 
-func clearByRequestType(appName, processType, requestType) error {
+func clearByRequestType(appName string, processType string, requestType string) error {
 	noun := "limits"
 	if requestType == "reserve" {
 		noun = "reservation"

From 3ab271f756b4dabd833a75d8c1ec2f556b557a23 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 15:32:20 -0400
Subject: [PATCH 019/163] refactor: drop implicit returns

---
 plugins/resource/subcommands.go | 35 +++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index cab48632a..a476df739 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -7,8 +7,8 @@ import (
 )
 
 // CommandLimit implements resource:limit
-func CommandLimit(args []string, processType string, r Resource, global bool) (err error) {
-	appName, err = getAppName(args, global)
+func CommandLimit(args []string, processType string, r Resource, global bool) error {
+	appName, err := getAppName(args, global)
 	if err != nil {
 		return err
 	}
@@ -17,8 +17,8 @@ func CommandLimit(args []string, processType string, r Resource, global bool) (e
 }
 
 // CommandLimitClear implements resource:limit-clear
-func CommandLimitClear(args []string, processType string, global bool) (err error) {
-	appName, err = getAppName(args, global)
+func CommandLimitClear(args []string, processType string, global bool) error {
+	appName, err := getAppName(args, global)
 	if err != nil {
 		return err
 	}
@@ -27,8 +27,8 @@ func CommandLimitClear(args []string, processType string, global bool) (err erro
 }
 
 // CommandReserve implements resource:reserve
-func CommandReserve(args []string, processType string, r Resource, global bool) (err error) {
-	appName, err = getAppName(args, global)
+func CommandReserve(args []string, processType string, r Resource, global bool) error {
+	appName, err := getAppName(args, global)
 	if err != nil {
 		return err
 	}
@@ -38,7 +38,7 @@ func CommandReserve(args []string, processType string, r Resource, global bool)
 
 // CommandReserveClear implements resource:reserve-clear
 func CommandReserveClear(args []string, processType string, global bool) error {
-	appName, err = getAppName(args, global)
+	appName, err := getAppName(args, global)
 	if err != nil {
 		return err
 	}
@@ -73,7 +73,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 
 	for _, key := range resources {
 		property := propertyKey(processType, requestType, key)
-		err = common.PropertyDelete("resource", appName, property)
+		err := common.PropertyDelete("resource", appName, property)
 		if err != nil {
 			return err
 		}
@@ -81,7 +81,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 	return nil
 }
 
-func setRequestType(appName string, processType string, r Resource, requestType string) (err error) {
+func setRequestType(appName string, processType string, r Resource, requestType string) error {
 	if len(processType) == 0 {
 		processType = "_all_"
 	}
@@ -103,7 +103,8 @@ func setRequestType(appName string, processType string, r Resource, requestType
 	}
 
 	if !hasValues {
-		return reportRequestType(appName, processType, requestType)
+		reportRequestType(appName, processType, requestType)
+		return nil
 	}
 
 	noun := "limits"
@@ -126,16 +127,16 @@ func setRequestType(appName string, processType string, r Resource, requestType
 		}
 
 		property := propertyKey(processType, requestType, key)
-		err = common.PropertyWrite("resource", appName, property, value)
+		err := common.PropertyWrite("resource", appName, property, value)
 		if err != nil {
-			return
+			return err
 		}
 	}
 
-	return
+	return nil
 }
 
-func reportRequestType(appName string, processType string, requestType string) (err error) {
+func reportRequestType(appName string, processType string, requestType string) {
 	noun := "limits"
 	if requestType == "reserve" {
 		noun = "reservation"
@@ -165,14 +166,14 @@ func reportRequestType(appName string, processType string, requestType string) (
 		value := common.PropertyGet("resource", appName, property)
 		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
 	}
-	return nil
+	return
 }
 
 func propertyKey(processType string, requestType string, key string) string {
 	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
 }
 
-func getAppName(args []string, global bool) (appName string, err error) {
+func getAppName(args []string, global bool) (string, error) {
 	appName := "_all_"
 	if global {
 		return appName, nil
@@ -183,7 +184,7 @@ func getAppName(args []string, global bool) (appName string, err error) {
 	}
 
 	appName = args[0]
-	if err = common.VerifyAppName(appName); err != nil {
+	if err := common.VerifyAppName(appName); err != nil {
 		return "", err
 	}
 

From 278a80cc2580144f16e61146dc4535833ea741dc Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 15:41:17 -0400
Subject: [PATCH 020/163] feat: switch from _all_ to _default_ for process type

This is a special process type that signifies it's the default value for everything.
---
 plugins/resource/subcommands.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index a476df739..040c9ef44 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -57,7 +57,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 		humanAppName = "default"
 	}
 	message := fmt.Sprintf("clearing %v %v", humanAppName, noun)
-	if processType != "_all_" {
+	if processType != "_default_" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
 	common.LogInfo2Quiet(message)
@@ -83,7 +83,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 
 func setRequestType(appName string, processType string, r Resource, requestType string) error {
 	if len(processType) == 0 {
-		processType = "_all_"
+		processType = "_default_"
 	}
 
 	resources := map[string]string{
@@ -116,7 +116,7 @@ func setRequestType(appName string, processType string, r Resource, requestType
 		message = fmt.Sprintf("Setting default resource %v", noun)
 	}
 
-	if processType != "_all_" {
+	if processType != "_default_" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
 	common.LogInfo2Quiet(message)
@@ -147,7 +147,7 @@ func reportRequestType(appName string, processType string, requestType string) {
 		humanAppName = "default"
 	}
 	message := fmt.Sprintf("resource %v %v information", noun, humanAppName)
-	if processType != "_all_" {
+	if processType != "_default_" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
 	common.LogInfo2Quiet(message)

From c9bbddcfcbbcad64dd9453afec77ba614598fc67 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 16:01:19 -0400
Subject: [PATCH 021/163] refactor: drop global resource limits

Global limits make it harder to reason about the inheritance in the system. Rather than support global limits, Dokku should provide primitives to automatically set them on an app at provision time, or explicitly set them for an app. Both of these are likely best suited for a higher-level provisioner, or a community plugin.
---
 docs/advanced-usage/resource-management.md    | 10 +--
 plugins/resource/src/commands/commands.go     |  7 +-
 .../subcommands/limit-clear/limit-clear.go    |  3 +-
 .../resource/src/subcommands/limit/limit.go   |  3 +-
 .../reserve-clear/reserve-clear.go            |  3 +-
 .../src/subcommands/reserve/reserve.go        |  3 +-
 plugins/resource/subcommands.go               | 80 +++++++++----------
 7 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 7725cefec..3ac2ef5f7 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -3,11 +3,11 @@
 > New as of 0.15.0
 
 ```
-dokku resource:limit [--global] [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
-dokku resource:reserve [--global] [--process-type <process-type,...>] [RESOURCE_OPTS...] <app>
-dokku resource:limit-clear [--process-type <process-type,...>] [<app>]
-dokku resource:reserve-clear [--process-type <process-type,...>] [<app>]
-dokku resource:report [<app>]
+resource:limit [--process-type <process-type>] [RESOURCE_OPTS...] <app>    # Limit resources for a given app/process-type combination
+resource:limit-clear [--process-type <process-type>] <app>                 # Limit resources for a given app/process-type combination
+resource:report [<app>] [<flag>]                                           # Displays a resource report for one or more apps
+resource:reserve [--process-type <process-type>] [RESOURCE_OPTS...] <app>  # Reserve resources for a given app/process-type combination
+resource:reserve-clear [--process-type <process-type>] <app>               # Reserve resources for a given app/process-type combination
 ```
 
 The resource plugin is meant to allow users to limit or reserve resources for a given app/process-type combination.
diff --git a/plugins/resource/src/commands/commands.go b/plugins/resource/src/commands/commands.go
index 5e13ed013..a998d631d 100644
--- a/plugins/resource/src/commands/commands.go
+++ b/plugins/resource/src/commands/commands.go
@@ -19,8 +19,11 @@ Manages resource settings for an app
 Additional commands:`
 
 	helpContent = `
-    resource:limit [--global] [--process-type process-type]  [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
-    resource:reserve [--global] [--process-type process-type] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
+    resource:limit [--process-type <process-type>] [RESOURCE_OPTS...] <app>, Limit resources for a given app/process-type combination
+    resource:limit-clear [--process-type <process-type>] <app>, Limit resources for a given app/process-type combination
+    resource:report [<app>] [<flag>], Displays a resource report for one or more apps
+    resource:reserve [--process-type <process-type>] [RESOURCE_OPTS...] <app>, Reserve resources for a given app/process-type combination
+    resource:reserve-clear [--process-type <process-type>] <app>, Reserve resources for a given app/process-type combination
 `
 )
 
diff --git a/plugins/resource/src/subcommands/limit-clear/limit-clear.go b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
index 32000d6d6..b794dfc30 100644
--- a/plugins/resource/src/subcommands/limit-clear/limit-clear.go
+++ b/plugins/resource/src/subcommands/limit-clear/limit-clear.go
@@ -11,10 +11,9 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:limit-clear", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to clear")
-	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	args.Parse(os.Args[2:])
 
-	err := resource.CommandLimitClear(args.Args(), *processType, *global)
+	err := resource.CommandLimitClear(args.Args(), *processType)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/limit/limit.go b/plugins/resource/src/subcommands/limit/limit.go
index 024835acd..d45438e3a 100644
--- a/plugins/resource/src/subcommands/limit/limit.go
+++ b/plugins/resource/src/subcommands/limit/limit.go
@@ -11,7 +11,6 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:limit", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to manage")
-	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to limit processes by")
 	memory := args.String("memory", "", "memory: The amount of memory to limit processes by")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to limit processes by")
@@ -29,7 +28,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandLimit(args.Args(), *processType, resources, *global)
+	err := resource.CommandLimit(args.Args(), *processType, resources)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
index c27a02bba..4f882388d 100644
--- a/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
+++ b/plugins/resource/src/subcommands/reserve-clear/reserve-clear.go
@@ -11,10 +11,9 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:reserve-clear", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to clear")
-	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	args.Parse(os.Args[2:])
 
-	err := resource.CommandReserveClear(args.Args(), *processType, *global)
+	err := resource.CommandReserveClear(args.Args(), *processType)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/src/subcommands/reserve/reserve.go b/plugins/resource/src/subcommands/reserve/reserve.go
index a62a34d55..afeccb551 100644
--- a/plugins/resource/src/subcommands/reserve/reserve.go
+++ b/plugins/resource/src/subcommands/reserve/reserve.go
@@ -11,7 +11,6 @@ import (
 func main() {
 	args := flag.NewFlagSet("resource:reserve", flag.ExitOnError)
 	processType := args.String("process-type", "", "process-type: A process type to manage")
-	global := args.Bool("global", false, "global: Whether to clear global settings or not")
 	cpu := args.String("cpu", "", "cpu: The amount of cpu to reserve for processes")
 	memory := args.String("memory", "", "memory: The amount of memory to reserve for processes")
 	memorySwap := args.String("memory-swap", "", "memory-swap: The amount of swap memory to reserve for processes")
@@ -29,7 +28,7 @@ func main() {
 		NetworkEgress:  *networkEgress,
 	}
 
-	err := resource.CommandReserve(args.Args(), *processType, resources, *global)
+	err := resource.CommandReserve(args.Args(), *processType, resources)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 040c9ef44..09a5dab73 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -7,8 +7,8 @@ import (
 )
 
 // CommandLimit implements resource:limit
-func CommandLimit(args []string, processType string, r Resource, global bool) error {
-	appName, err := getAppName(args, global)
+func CommandLimit(args []string, processType string, r Resource) error {
+	appName, err := getAppName(args)
 	if err != nil {
 		return err
 	}
@@ -17,8 +17,8 @@ func CommandLimit(args []string, processType string, r Resource, global bool) er
 }
 
 // CommandLimitClear implements resource:limit-clear
-func CommandLimitClear(args []string, processType string, global bool) error {
-	appName, err := getAppName(args, global)
+func CommandLimitClear(args []string, processType string) error {
+	appName, err := getAppName(args)
 	if err != nil {
 		return err
 	}
@@ -27,8 +27,8 @@ func CommandLimitClear(args []string, processType string, global bool) error {
 }
 
 // CommandReserve implements resource:reserve
-func CommandReserve(args []string, processType string, r Resource, global bool) error {
-	appName, err := getAppName(args, global)
+func CommandReserve(args []string, processType string, r Resource) error {
+	appName, err := getAppName(args)
 	if err != nil {
 		return err
 	}
@@ -37,8 +37,8 @@ func CommandReserve(args []string, processType string, r Resource, global bool)
 }
 
 // CommandReserveClear implements resource:reserve-clear
-func CommandReserveClear(args []string, processType string, global bool) error {
-	appName, err := getAppName(args, global)
+func CommandReserveClear(args []string, processType string) error {
+	appName, err := getAppName(args)
 	if err != nil {
 		return err
 	}
@@ -52,31 +52,40 @@ func clearByRequestType(appName string, processType string, requestType string)
 		noun = "reservation"
 	}
 
-	humanAppName := appName
-	if appName == "_all_" {
-		humanAppName = "default"
-	}
-	message := fmt.Sprintf("clearing %v %v", humanAppName, noun)
-	if processType != "_default_" {
+	message := fmt.Sprintf("clearing %v %v", appName, noun)
+	if processType != "_default_" && processType != "" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
 	common.LogInfo2Quiet(message)
 
-	resources := []string{
-		"cpu",
-		"memory",
-		"memory-swap",
-		"network",
-		"network-ingress",
-		"network-egress",
-	}
-
-	for _, key := range resources {
-		property := propertyKey(processType, requestType, key)
-		err := common.PropertyDelete("resource", appName, property)
+	if processType == "" {
+		resources, err := common.PropertyGetAll("resource", appName)
 		if err != nil {
 			return err
 		}
+		for key, _ := range resources {
+			err := common.PropertyDelete("resource", appName, key)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		resources := []string{
+			"cpu",
+			"memory",
+			"memory-swap",
+			"network",
+			"network-ingress",
+			"network-egress",
+		}
+
+		for _, key := range resources {
+			property := propertyKey(processType, requestType, key)
+			err := common.PropertyDelete("resource", appName, property)
+			if err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }
@@ -112,10 +121,6 @@ func setRequestType(appName string, processType string, r Resource, requestType
 		noun = "reservation"
 	}
 	message := fmt.Sprintf("Setting resource %v for %v", noun, appName)
-	if appName == "_all_" {
-		message = fmt.Sprintf("Setting default resource %v", noun)
-	}
-
 	if processType != "_default_" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
@@ -142,11 +147,7 @@ func reportRequestType(appName string, processType string, requestType string) {
 		noun = "reservation"
 	}
 
-	humanAppName := appName
-	if appName == "_all_" {
-		humanAppName = "default"
-	}
-	message := fmt.Sprintf("resource %v %v information", noun, humanAppName)
+	message := fmt.Sprintf("resource %v %v information", noun, appName)
 	if processType != "_default_" {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
@@ -173,17 +174,12 @@ func propertyKey(processType string, requestType string, key string) string {
 	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
 }
 
-func getAppName(args []string, global bool) (string, error) {
-	appName := "_all_"
-	if global {
-		return appName, nil
-	}
-
+func getAppName(args []string) (string, error) {
 	if len(args) < 1 {
 		return "", errors.New("Please specify an app to run the command on")
 	}
 
-	appName = args[0]
+	appName := args[0]
 	if err := common.VerifyAppName(appName); err != nil {
 		return "", err
 	}

From e8134f9c2cd6ba70e2c1046d753e9f852ec0451e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 16:43:31 -0400
Subject: [PATCH 022/163] feat: implement resource:report

---
 docs/advanced-usage/resource-management.md    | 103 +++++++++---------
 plugins/common/properties.go                  |  20 ++++
 plugins/resource/Makefile                     |   6 +-
 plugins/resource/resource.go                  |  68 ++++++++++++
 .../resource/src/subcommands/report/report.go |  33 ++++++
 .../resource/src/triggers/report/report.go    |  15 +++
 6 files changed, 193 insertions(+), 52 deletions(-)
 create mode 100644 plugins/resource/src/subcommands/report/report.go
 create mode 100644 plugins/resource/src/triggers/report/report.go

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 3ac2ef5f7..3a30ede35 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -305,44 +305,44 @@ dokku resource:report
 
 ```
 =====> node-js-app resource information
-       Resource limit cpu:
-       Resource limit memory: 1024
-       Resource limit memory swap: 0
-       Resource limit network: 10
-       Resource limit network ingress:
-       Resource limit network egress:
-       Resource reservation cpu:
-       Resource reservation memory: 512
-       Resource reservation memory swap:
-       Resource reservation network: 8
-       Resource reservation network ingress:
-       Resource reservation network egress:
+       web limit cpu:
+       web limit memory: 1024
+       web limit memory swap: 0
+       web limit network: 10
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory: 512
+       web reservation memory swap:
+       web reservation network: 8
+       web reservation network ingress:
+       web reservation network egress:
 =====> python-sample resource information
-       Resource limit cpu:
-       Resource limit memory:
-       Resource limit memory swap:
-       Resource limit network:
-       Resource limit network ingress:
-       Resource limit network egress:
-       Resource reservation cpu:
-       Resource reservation memory:
-       Resource reservation memory swap:
-       Resource reservation network:
-       Resource reservation network ingress:
-       Resource reservation network egress:
+       web limit cpu:
+       web limit memory:
+       web limit memory swap:
+       web limit network:
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory:
+       web reservation memory swap:
+       web reservation network:
+       web reservation network ingress:
+       web reservation network egress:
 =====> ruby-sample resource information
-       Resource limit cpu:
-       Resource limit memory:
-       Resource limit memory swap:
-       Resource limit network:
-       Resource limit network ingress:
-       Resource limit network egress:
-       Resource reservation cpu:
-       Resource reservation memory:
-       Resource reservation memory swap:
-       Resource reservation network:
-       Resource reservation network ingress:
-       Resource reservation network egress:
+       web limit cpu:
+       web limit memory:
+       web limit memory swap:
+       web limit network:
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory:
+       web reservation memory swap:
+       web reservation network:
+       web reservation network ingress:
+       web reservation network egress:
 ```
 
 You can run the command for a specific app also.
@@ -353,22 +353,27 @@ dokku resource:report node-js-app
 
 ```
 =====> node-js-app resource information
-       Resource limit cpu:
-       Resource limit memory: 1024
-       Resource limit memory swap: 0
-       Resource limit network: 10
-       Resource limit network ingress:
-       Resource limit network egress:
-       Resource reservation cpu:
-       Resource reservation memory: 512
-       Resource reservation memory swap:
-       Resource reservation network: 8
-       Resource reservation network ingress:
-       Resource reservation network egress:
+       web limit cpu:
+       web limit memory: 1024
+       web limit memory swap: 0
+       web limit network: 10
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory: 512
+       web reservation memory swap:
+       web reservation network: 8
+       web reservation network ingress:
+       web reservation network egress:
 ```
 
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku resource:report node-js-app --resource-memory
+# Note the periods in the flag name
+dokku resource:report node-js-app --resource-web.limit.memory
+```
+
+```
+1024
 ```
diff --git a/plugins/common/properties.go b/plugins/common/properties.go
index f09d02b84..d780003ff 100644
--- a/plugins/common/properties.go
+++ b/plugins/common/properties.go
@@ -77,6 +77,26 @@ func PropertyGet(pluginName string, appName string, property string) string {
 	return PropertyGetDefault(pluginName, appName, property, "")
 }
 
+// PropertyGetAll returns a map of all properties for a given app
+func PropertyGetAll(pluginName string, appName string) (map[string]string, error) {
+	properties := make(map[string]string)
+	pluginAppConfigRoot := getPluginAppPropertyPath(pluginName, appName)
+	files, err := ioutil.ReadDir(pluginAppConfigRoot)
+	if err != nil {
+		return properties, err
+	}
+
+	for _, file := range files {
+		if file.IsDir() {
+			continue
+		}
+		property := file.Name()
+		properties[property] = PropertyGet(pluginName, appName, property)
+	}
+
+	return properties, nil
+}
+
 // PropertyGetDefault returns the value for a given property with a specified default value
 func PropertyGetDefault(pluginName, appName, property, defaultValue string) (val string) {
 	if !PropertyExists(pluginName, appName, property) {
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index d2b724c7b..71ef38f1f 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -2,8 +2,8 @@ include ../../common.mk
 
 GO_ARGS ?= -a
 
-SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/reserve subcommands/reserve-clear
-TRIGGERS = triggers/install triggers/post-delete
+SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/report subcommands/reserve subcommands/reserve-clear
+TRIGGERS = triggers/install triggers/post-delete triggers/report
 build-in-docker: clean
 	docker run --rm \
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
@@ -23,7 +23,7 @@ subcommands/%: src/subcommands/*/%.go
 	go build $(GO_ARGS) -o $@ $<
 
 clean:
-	rm -rf commands subcommands triggers install post-delete
+	rm -rf commands subcommands triggers install post-delete report
 
 src-clean:
 	rm -rf .gitignore src triggers vendor Makefile *.go
diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index 1f188893a..0bf0e251a 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -1,5 +1,15 @@
 package resource
 
+import (
+	"fmt"
+	"os"
+	"reflect"
+	"sort"
+	"strings"
+
+	"github.com/dokku/dokku/plugins/common"
+)
+
 // Resource is a collection of resource constraints for apps
 type Resource struct {
 	CPU            string `json:"cpu"`
@@ -9,3 +19,61 @@ type Resource struct {
 	NetworkIngress string `json:"network-ingress"`
 	NetworkEgress  string `json:"network-egress"`
 }
+
+// ReportSingleApp is an internal function that displays the app report for one or more apps
+func ReportSingleApp(appName, infoFlag string) {
+	if err := common.VerifyAppName(appName); err != nil {
+		common.LogFail(err.Error())
+	}
+
+	resources, err := common.PropertyGetAll("resource", appName)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+
+	flags := []string{}
+	infoFlags := map[string]string{}
+	for key, value := range resources {
+		flag := fmt.Sprintf("--resource-%v", key)
+		flags = append(flags, flag)
+		infoFlags[flag] = value
+	}
+	sort.Strings(flags)
+
+	if len(infoFlag) == 0 {
+		common.LogInfo2Quiet(fmt.Sprintf("%s resource information", appName))
+		for _, k := range flags {
+			v := infoFlags[k]
+			key := strings.Replace(strings.Replace(strings.TrimPrefix(k, "--resource-"), "-", " ", -1), ".", " ", -1)
+			common.LogVerbose(fmt.Sprintf("%s%s", Right(fmt.Sprintf("%s:", key), 31, " "), v))
+		}
+		return
+	}
+
+	for _, k := range flags {
+		v := infoFlags[k]
+		if infoFlag == k {
+			fmt.Fprintln(os.Stdout, v)
+			return
+		}
+	}
+
+	keys := reflect.ValueOf(infoFlags).MapKeys()
+	strkeys := make([]string, len(keys))
+	for i := 0; i < len(keys); i++ {
+		strkeys[i] = keys[i].String()
+	}
+	common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
+}
+
+func times(str string, n int) (out string) {
+	for i := 0; i < n; i++ {
+		out += str
+	}
+	return
+}
+
+// Right right-pads the string with pad up to len runes
+func Right(str string, length int, pad string) string {
+	return str + times(pad, length-len(str))
+}
diff --git a/plugins/resource/src/subcommands/report/report.go b/plugins/resource/src/subcommands/report/report.go
new file mode 100644
index 000000000..f8385c3bd
--- /dev/null
+++ b/plugins/resource/src/subcommands/report/report.go
@@ -0,0 +1,33 @@
+package main
+
+import (
+	"flag"
+	"strings"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+// displays a resource report for one or more apps
+func main() {
+	flag.Parse()
+	appName := flag.Arg(1)
+	infoFlag := flag.Arg(2)
+
+	if strings.HasPrefix(appName, "--") {
+		common.LogFail("The resource:report command does not support flags without an app name")
+	}
+
+	if len(appName) == 0 {
+		apps, err := common.DokkuApps()
+		if err != nil {
+			return
+		}
+		for _, appName := range apps {
+			resource.ReportSingleApp(appName, infoFlag)
+		}
+		return
+	}
+
+	resource.ReportSingleApp(appName, infoFlag)
+}
diff --git a/plugins/resource/src/triggers/report/report.go b/plugins/resource/src/triggers/report/report.go
new file mode 100644
index 000000000..94a73d62f
--- /dev/null
+++ b/plugins/resource/src/triggers/report/report.go
@@ -0,0 +1,15 @@
+package main
+
+import (
+	"flag"
+
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+// displays a buildpacks report for one or more apps
+func main() {
+	flag.Parse()
+	appName := flag.Arg(0)
+
+	resource.ReportSingleApp(appName, "")
+}

From 00c9e5a5e9e6350531b2cf77e7afd7952fa4f79d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 18 Mar 2019 18:21:44 -0400
Subject: [PATCH 023/163] feat: first pass at implement resource limitation on
 a pre-process basis

---
 docs/advanced-usage/resource-management.md    |  2 +
 .../advanced-usage/schedulers/docker-local.md | 14 ++++
 docs/development/plugin-triggers.md           | 42 +++++++++++
 plugins/resource/.gitignore                   |  2 +
 plugins/resource/Makefile                     |  5 +-
 .../docker-args-process-deploy.go             | 74 +++++++++++++++++++
 .../resource/src/triggers/report/report.go    |  2 +-
 7 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 3a30ede35..02227dd88 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -27,6 +27,8 @@ Valid resource options include:
 - `--network-ingress`
 - `--network-egress`
 
+Resource limits and reservations are applied only during the `run` and `deploy` phases of an application, and will not impact the `build` phase of an application.
+
 ### Resource Limits
 
 When specified and supported, a resource limit will ensure that your app does not go _over_ the specified value. If this occurs, the underlying scheduler may either cap resource utilization, or it may decide to terminate and reschedule your process.
diff --git a/docs/advanced-usage/schedulers/docker-local.md b/docs/advanced-usage/schedulers/docker-local.md
index 574486e36..2394d2029 100644
--- a/docs/advanced-usage/schedulers/docker-local.md
+++ b/docs/advanced-usage/schedulers/docker-local.md
@@ -53,3 +53,17 @@ This plugin implements various functionality through `plugn` triggers to integra
 - `scheduler-stop`
 - `scheduler-tags-create`
 - `scheduler-tags-destroy`
+
+## Supported Resource Management Properties
+
+The `docker-local` scheduler supports a minimal list of resource _limits_ and _reservations_. The following properties are supported:
+
+### Resource Limits
+
+- cpu: (docker option: `--cpus`), and is specified in number of CPUs a process can access.
+- memory: (docker option: `--memory`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
+- memory-swap: (docker option: `--memory-swap`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
+
+### Resource Reservations
+
+- memory: (docker option: `--memory-reservation`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 4f4abbf5e..2ed8b55f2 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -248,6 +248,8 @@ echo 'derp.dkr.ecr.us-east-1.amazonaws.com'
 
 ### `docker-args-build`
 
+> Warning: Deprecated, please use `docker-args-process-build` instead
+
 - Description:
 - Invoked by: `internal function dokku_build() (build phase)`
 - Arguments: `$APP $IMAGE_SOURCE_TYPE`
@@ -271,6 +273,8 @@ echo -n "$STDIN$output"
 
 ### `docker-args-deploy`
 
+> Warning: Deprecated, please use `docker-args-process-deploy` instead
+
 - Description:
 - Invoked by: `dokku deploy`
 - Arguments: `$APP $IMAGE_TAG [$PROC_TYPE $CONTAINER_INDEX]`
@@ -289,6 +293,8 @@ verify_app_name "$APP"
 
 ### `docker-args-run`
 
+> Warning: Deprecated, please use `docker-args-process-run` instead
+
 - Description:
 - Invoked by: `dokku run`
 - Arguments: `$APP $IMAGE_TAG`
@@ -305,6 +311,42 @@ verify_app_name "$APP"
 # TODO
 ```
 
+### `docker-args-process-deploy`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
+- Invoked by: `dokku deploy`
+- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE [$PROC_TYPE $CONTAINER_INDEX]`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
+### `docker-args-process-run`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker run options.
+- Invoked by: `dokku run`
+- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE [$PROC_TYPE $CONTAINER_INDEX]`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
 ### `git-post-pull`
 
 - Description:
diff --git a/plugins/resource/.gitignore b/plugins/resource/.gitignore
index 56aebe3b7..efc010131 100644
--- a/plugins/resource/.gitignore
+++ b/plugins/resource/.gitignore
@@ -4,3 +4,5 @@
 /install
 /post-delete
 /report
+/docker-args-process-deploy
+/docker-args-process-run
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index 71ef38f1f..2fcb2d81d 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -3,7 +3,7 @@ include ../../common.mk
 GO_ARGS ?= -a
 
 SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/report subcommands/reserve subcommands/reserve-clear
-TRIGGERS = triggers/install triggers/post-delete triggers/report
+TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/post-delete triggers/report
 build-in-docker: clean
 	docker run --rm \
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
@@ -23,7 +23,7 @@ subcommands/%: src/subcommands/*/%.go
 	go build $(GO_ARGS) -o $@ $<
 
 clean:
-	rm -rf commands subcommands triggers install post-delete report
+	rm -rf commands subcommands triggers docker-args-process-deploy docker-args-process-run install post-delete report
 
 src-clean:
 	rm -rf .gitignore src triggers vendor Makefile *.go
@@ -35,3 +35,4 @@ triggers/%: src/triggers/*/%.go
 
 triggers-copy:
 	cp triggers/* .
+	ln -s docker-args-process-deploy docker-args-process-run
diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
new file mode 100644
index 000000000..958f21f10
--- /dev/null
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -0,0 +1,74 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+
+	"github.com/dokku/dokku/plugins/common"
+)
+
+// outputs the process-specific docker options
+func main() {
+	stdin, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+
+	flag.Parse()
+	appName := flag.Arg(0)
+	procType := flag.Arg(3)
+
+	resources, err := common.PropertyGetAll("resource", appName)
+	if err != nil {
+		fmt.Print(string(stdin))
+		common.LogFail(err.Error())
+	}
+
+	limits := make(map[string]string)
+	reservations := make(map[string]string)
+
+	validLimits := map[string]bool{
+		"cpu":         true,
+		"memory":      true,
+		"memory-swap": true,
+	}
+	validReservations := map[string]bool{
+		"memory": true,
+	}
+	validPrefixes := []string{"_default_.", fmt.Sprintf("%s.", procType)}
+	for _, validPrefix := range validPrefixes {
+		for key, value := range resources {
+			if !strings.HasPrefix(key, validPrefix) {
+				continue
+			}
+			parts := strings.SplitN(strings.TrimPrefix(key, validPrefix), ".", 2)
+			if parts[0] == "limit" {
+				if !validLimits[parts[1]] {
+					continue
+				}
+
+				limits[parts[1]] = value
+			}
+			if parts[0] == "reserve" {
+				if !validReservations[parts[1]] {
+					continue
+				}
+
+				reservations[parts[1]] = value
+			}
+		}
+	}
+
+	for key, value := range limits {
+		fmt.Print(" --%s=%s ", key, value)
+	}
+
+	for key, value := range reservations {
+		fmt.Print(" --%s-reservation=%s ", key, value)
+	}
+
+	fmt.Print(string(stdin))
+}
diff --git a/plugins/resource/src/triggers/report/report.go b/plugins/resource/src/triggers/report/report.go
index 94a73d62f..b34ad49e0 100644
--- a/plugins/resource/src/triggers/report/report.go
+++ b/plugins/resource/src/triggers/report/report.go
@@ -6,7 +6,7 @@ import (
 	"github.com/dokku/dokku/plugins/resource"
 )
 
-// displays a buildpacks report for one or more apps
+// displays a resource report for one or more apps
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)

From 8db3b8e333f0fa12e71c1facc4a4722de9591a07 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 22 Mar 2019 14:18:38 -0400
Subject: [PATCH 024/163] fix: do not barf if there are no resources specified
 for an application

---
 .../docker-args-process-deploy/docker-args-process-deploy.go    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
index 958f21f10..a28acb3f0 100644
--- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -24,7 +24,7 @@ func main() {
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
 		fmt.Print(string(stdin))
-		common.LogFail(err.Error())
+		return
 	}
 
 	limits := make(map[string]string)

From 3f0126a4715fe37ac93fa093cb6f124a4a539485 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 22 Mar 2019 16:13:01 -0400
Subject: [PATCH 025/163] fix: do not output empty arguments

Also ensure we use Printf instead of Print...
---
 .../docker-args-process-deploy.go                      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
index a28acb3f0..5b92d85df 100644
--- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -63,11 +63,17 @@ func main() {
 	}
 
 	for key, value := range limits {
-		fmt.Print(" --%s=%s ", key, value)
+		if value == "" {
+			continue
+		}
+		fmt.Printf(" --%s=%s ", key, value)
 	}
 
 	for key, value := range reservations {
-		fmt.Print(" --%s-reservation=%s ", key, value)
+		if value == "" {
+			continue
+		}
+		fmt.Printf(" --%s-reservation=%s ", key, value)
 	}
 
 	fmt.Print(string(stdin))

From 243d5ecc43ae950615c6c4a26f171e4b43fe7196 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 11:30:45 -0400
Subject: [PATCH 026/163] feat: integrate resource plugin with
 scheduler-docker-local

---
 docs/development/plugin-triggers.md           |  16 ++
 plugins/app-json/internal-functions           |   4 +
 plugins/common/functions                      |   6 +
 .../scheduler-docker-local/scheduler-deploy   |   3 +
 plugins/scheduler-docker-local/scheduler-run  |   6 +-
 tests/unit/10_apps.bats                       |   4 +-
 tests/unit/20_resource.bats                   | 137 ++++++++++++++++++
 7 files changed, 173 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 tests/unit/10_apps.bats
 create mode 100644 tests/unit/20_resource.bats

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 2ed8b55f2..443e0d0be 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1199,6 +1199,22 @@ fi
 plugn trigger receive-app $APP $newrev
 ```
 
+### `resource-get-property`
+
+- Description: Fetches a given resource property value
+- Invoked by:
+- Arguments: `$APP` `$PROC_TYPE` `$RESOURCE_TYPE` `$PROPERTY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; PROC_TYPE="$2" RESOURCE_TYPE="$3" PROPERTY="$4"
+
+# TODO
+```
+
 ### `retire-container-failed`
 
 - Description: Allows you to run commands if/when retiring old containers has failed
diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index a3351df47..46feb92d1 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -83,6 +83,10 @@ execute_script() {
   # strip --restart args from DOCKER_ARGS
   local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
 
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
   # eval args as array to respect escapes
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"
diff --git a/plugins/common/functions b/plugins/common/functions
index 0cf7fc690..c5e9af265 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -533,6 +533,9 @@ dokku_build() {
 
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
+      local IMAGE_SOURCE_TYPE="herokuish"
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
       declare -a ARG_ARRAY
       eval "ARG_ARRAY=($DOCKER_ARGS)"
       # shellcheck disable=SC2086
@@ -558,6 +561,9 @@ dokku_build() {
 
       [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
+      local IMAGE_SOURCE_TYPE="dockerfile"
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
       # strip --volume and -v args from DOCKER_ARGS
       local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
       declare -a ARG_ARRAY
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index ef042625d..99f73a262 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -25,6 +25,8 @@ scheduler-docker-local-scheduler-deploy() {
   plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
 
   is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  [[ "$DOKKU_HEROKUISH" == "true" ]] && IMAGE_SOURCE_TYPE="herokuish"
   local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
   local oldids=$(get_app_container_ids "$APP")
 
@@ -69,6 +71,7 @@ scheduler-docker-local-scheduler-deploy() {
       local DOCKER_ARGS
       DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
       DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PROC_TYPE" "$CONTAINER_INDEX")
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
 
       declare -a ARG_ARRAY
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index c28318c60..0b3a228ff 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -27,6 +27,10 @@ scheduler-docker-local-scheduler-run() {
   local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
   [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
 
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"
 
@@ -38,7 +42,7 @@ scheduler-docker-local-scheduler-run() {
   fi
 
   has_tty && DOKKU_RUN_OPTS+=" -i -t"
-  is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
+  [[ "$IMAGE_SOURCE_TYPE" == "herokuish" ]] && local EXEC_CMD="/exec"
 
   DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
 
diff --git a/tests/unit/10_apps.bats b/tests/unit/10_apps.bats
old mode 100755
new mode 100644
index e92e07a2c..ccb4bbf44
--- a/tests/unit/10_apps.bats
+++ b/tests/unit/10_apps.bats
@@ -2,11 +2,11 @@
 
 load test_helper
 
-setup () {
+setup() {
   global_setup
 }
 
-teardown () {
+teardown() {
   global_teardown
 }
 
diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
new file mode 100644
index 000000000..372fad236
--- /dev/null
+++ b/tests/unit/20_resource.bats
@@ -0,0 +1,137 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  create_app
+}
+
+teardown() {
+  destroy_app
+  global_teardown
+}
+
+@test "(docker-options) resource:limit" {
+  run /bin/bash -c "dokku resource:limit $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "resource limits $TEST_APP information"
+
+  deploy_app
+  run /bin/bash -c "dokku resource:limit --memory 512MB $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit --memory 1024MB --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit-clear --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+}
+
+@test "(docker-options) resource:reserve" {
+  run /bin/bash -c "dokku resource:reserve $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "resource reservation $TEST_APP information"
+
+  deploy_app
+  run /bin/bash -c "dokku resource:reserve --memory 512MB $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve --memory 1024MB --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve-clear --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+}

From c2898ec040ef4a78352e69dc40e0b2c8c16e6e97 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 11:31:18 -0400
Subject: [PATCH 027/163] feat: add trigger to allow retrieving resource
 properties on the fly

---
 plugins/resource/.gitignore                   |  1 +
 plugins/resource/Makefile                     |  4 +--
 plugins/resource/resource.go                  | 20 ++++++++++++++
 .../resource-get-property.go                  | 26 +++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 plugins/resource/src/triggers/resource-get-property/resource-get-property.go

diff --git a/plugins/resource/.gitignore b/plugins/resource/.gitignore
index efc010131..bdb6a1395 100644
--- a/plugins/resource/.gitignore
+++ b/plugins/resource/.gitignore
@@ -6,3 +6,4 @@
 /report
 /docker-args-process-deploy
 /docker-args-process-run
+/resource-get-property
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index 2fcb2d81d..582d8d44b 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -3,7 +3,7 @@ include ../../common.mk
 GO_ARGS ?= -a
 
 SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/report subcommands/reserve subcommands/reserve-clear
-TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/post-delete triggers/report
+TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/post-delete triggers/report triggers/resource-get-property
 build-in-docker: clean
 	docker run --rm \
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
@@ -23,7 +23,7 @@ subcommands/%: src/subcommands/*/%.go
 	go build $(GO_ARGS) -o $@ $<
 
 clean:
-	rm -rf commands subcommands triggers docker-args-process-deploy docker-args-process-run install post-delete report
+	rm -rf commands subcommands triggers docker-args-process-deploy docker-args-process-run install post-delete report resource-get-property
 
 src-clean:
 	rm -rf .gitignore src triggers vendor Makefile *.go
diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index 0bf0e251a..0d8e0187f 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -1,6 +1,7 @@
 package resource
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"reflect"
@@ -66,6 +67,25 @@ func ReportSingleApp(appName, infoFlag string) {
 	common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
 }
 
+func GetResourceValue(appName string, procType string, resourceType string, prefix string) (string, error) {
+	resources, err := common.PropertyGetAll("resource", appName)
+	if err != nil {
+		return "", err
+	}
+
+	for key, value := range resources {
+		parts := strings.SplitN(strings.TrimPrefix(key, prefix), ".", 2)
+		if parts[0] != resourceType {
+			return "", err
+		}
+		if parts[1] == prefix {
+			return value, nil
+		}
+	}
+
+	return "", errors.New("No value found")
+}
+
 func times(str string, n int) (out string) {
 	for i := 0; i < n; i++ {
 		out += str
diff --git a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
new file mode 100644
index 000000000..d8b0759ba
--- /dev/null
+++ b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
@@ -0,0 +1,26 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/resource"
+)
+
+// writes the resource property to stdout for a given app container
+func main() {
+	flag.Parse()
+	appName := flag.Arg(0)
+	procType := flag.Arg(1)
+	resourceType := flag.Arg(1)
+	property := flag.Arg(1)
+
+	value, err := resource.GetResourceValue(appName, procType, resourceType, property)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+
+	fmt.Fprintln(os.Stdout, value)
+}

From 1683095233f1ac5d9d6247927fd787679f6fa576 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 12:41:06 -0400
Subject: [PATCH 028/163] fix: try and decrease number of compiles during
 release process

---
 Makefile                  |  1 +
 deb.mk                    | 55 ++++++++-------------------------------
 package.mk                | 35 +++++++++++++++++++++++++
 plugins/resource/Makefile |  2 +-
 rpm.mk                    | 46 +++++---------------------------
 5 files changed, 54 insertions(+), 85 deletions(-)
 create mode 100644 package.mk

diff --git a/Makefile b/Makefile
index 40715fcdc..61718d955 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ include common.mk
 .PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand procfile-util plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
 
 include tests.mk
+include package.mk
 include deb.mk
 include rpm.mk
 include arch.mk
diff --git a/deb.mk b/deb.mk
index 6cc71853a..016139c4d 100644
--- a/deb.mk
+++ b/deb.mk
@@ -100,53 +100,20 @@ deb-herokuish:
 		--license 'MIT License' \
 		.
 
-deb-dokku:
-	rm -rf /tmp/tmp /tmp/build dokku_*_$(DOKKU_ARCHITECTURE).deb
-	mkdir -p /tmp/tmp /tmp/build
+deb-dokku: /tmp/build-dokku/var/lib/dokku/GIT_REV
+	rm -f $(BUILD_DIRECTORY)/dokku_*_$(DOKKU_ARCHITECTURE).deb
 
-	cp -r debian /tmp/build/DEBIAN
-	mkdir -p /tmp/build/usr/share/bash-completion/completions
-	mkdir -p /tmp/build/usr/bin
-	mkdir -p /tmp/build/usr/share/doc/dokku
-	mkdir -p /tmp/build/usr/share/dokku/contrib
-	mkdir -p /tmp/build/usr/share/lintian/overrides
-	mkdir -p /tmp/build/usr/share/man/man1
-	mkdir -p /tmp/build/var/lib/dokku/core-plugins/available
-
-	cp dokku /tmp/build/usr/bin
-	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
-	cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
-	find . -name ".DS_Store" -depth -exec rm {} \;
-	$(MAKE) go-build
-	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
-	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
-	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
-	$(MAKE) help2man
-	$(MAKE) addman
-	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
-	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
-	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
-ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > /tmp/build/var/lib/dokku/VERSION
-else
-	echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
-endif
-	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
+	cat /tmp/build-dokku/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build-dokku/var/lib/dokku/STABLE_VERSION
 ifneq (,$(findstring false,$(IS_RELEASE)))
-	sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
+	sed -i.bak -e "s/^/`date +%s`:/" /tmp/build-dokku/var/lib/dokku/STABLE_VERSION && rm /tmp/build-dokku/var/lib/dokku/STABLE_VERSION.bak
 endif
-	rm -f /tmp/build/DEBIAN/lintian-overrides
-	cp debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
-ifdef DOKKU_GIT_REV
-	echo "$(DOKKU_GIT_REV)" > /tmp/build/var/lib/dokku/GIT_REV
-else
-	git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
-endif
-	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control && rm /tmp/build/DEBIAN/control.bak
-	dpkg-deb --build /tmp/build "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
-	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+
+	cp -r debian /tmp/build-dokku/DEBIAN
+	rm -f /tmp/build-dokku/DEBIAN/lintian-overrides
+	cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
+	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
+	dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
 
 deb-dokku-update:
 	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
diff --git a/package.mk b/package.mk
new file mode 100644
index 000000000..2b9a3dc01
--- /dev/null
+++ b/package.mk
@@ -0,0 +1,35 @@
+/tmp/build-dokku/var/lib/dokku/GIT_REV:
+	mkdir -p /tmp/build-dokku
+	mkdir -p /tmp/build-dokku/usr/share/bash-completion/completions
+	mkdir -p /tmp/build-dokku/usr/bin
+	mkdir -p /tmp/build-dokku/usr/share/doc/dokku
+	mkdir -p /tmp/build-dokku/usr/share/dokku/contrib
+	mkdir -p /tmp/build-dokku/usr/share/lintian/overrides
+	mkdir -p /tmp/build-dokku/usr/share/man/man1
+	mkdir -p /tmp/build-dokku/var/lib/dokku/core-plugins/available
+
+	cp dokku /tmp/build-dokku/usr/bin
+	cp LICENSE /tmp/build-dokku/usr/share/doc/dokku/copyright
+	cp contrib/bash-completion /tmp/build-dokku/usr/share/bash-completion/completions/dokku
+	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build-dokku/var/lib/dokku/core-plugins/common.mk
+	cp -r plugins/* /tmp/build-dokku/var/lib/dokku/core-plugins/available
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build-dokku/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build-dokku/var/lib/dokku/core-plugins/available/$$plugin/.core; done
+	rm /tmp/build-dokku/var/lib/dokku/core-plugins/common.mk
+	$(MAKE) help2man
+	$(MAKE) addman
+	cp /usr/local/share/man/man1/dokku.1 /tmp/build-dokku/usr/share/man/man1/dokku.1
+	gzip -9 /tmp/build-dokku/usr/share/man/man1/dokku.1
+	cp contrib/dokku-installer.py /tmp/build-dokku/usr/share/dokku/contrib
+ifeq ($(DOKKU_VERSION),master)
+	git describe --tags > /tmp/build-dokku/var/lib/dokku/VERSION
+else
+	echo $(DOKKU_VERSION) > /tmp/build-dokku/var/lib/dokku/VERSION
+endif
+ifdef DOKKU_GIT_REV
+	echo "$(DOKKU_GIT_REV)" > /tmp/build-dokku/var/lib/dokku/GIT_REV
+else
+	git rev-parse HEAD > /tmp/build-dokku/var/lib/dokku/GIT_REV
+endif
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index 582d8d44b..6859e0283 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -35,4 +35,4 @@ triggers/%: src/triggers/*/%.go
 
 triggers-copy:
 	cp triggers/* .
-	ln -s docker-args-process-deploy docker-args-process-run
+	ln -sf docker-args-process-deploy docker-args-process-run
diff --git a/rpm.mk b/rpm.mk
index 9bb455a60..ddb7fe073 100644
--- a/rpm.mk
+++ b/rpm.mk
@@ -46,51 +46,17 @@ rpm-herokuish:
 		--license 'MIT License' \
 		.
 
-rpm-dokku:
-	rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/dokku_*_$(RPM_ARCHITECTURE).rpm
-	mkdir -p /tmp/tmp /tmp/build
+rpm-dokku: /tmp/build-dokku/var/lib/dokku/GIT_REV
+	rm -f $(BUILD_DIRECTORY)/dokku_*_$(RPM_ARCHITECTURE).rpm
 
-	mkdir -p /tmp/build/usr/share/bash-completion/completions
-	mkdir -p /tmp/build/usr/bin
-	mkdir -p /tmp/build/usr/share/doc/dokku
-	mkdir -p /tmp/build/usr/share/dokku/contrib
-	mkdir -p /tmp/build/usr/share/lintian/overrides
-	mkdir -p /tmp/build/usr/share/man/man1
-	mkdir -p /tmp/build/var/lib/dokku/core-plugins/available
-
-	cp dokku /tmp/build/usr/bin
-	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
-	cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
-	find . -name ".DS_Store" -depth -exec rm {} \;
-	$(MAKE) go-build
-	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
-	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
-	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
-	$(MAKE) help2man
-	$(MAKE) addman
-	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
-	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
-	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
-ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > /tmp/build/var/lib/dokku/VERSION
-else
-	echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
-endif
-	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
+	cat /tmp/build-dokku/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build-dokku/var/lib/dokku/STABLE_VERSION
 ifneq (,$(findstring false,$(IS_RELEASE)))
-	sed -i.bak -e "s/^/`date +%s`-/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
-endif
-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.bak -e "s/^/`date +%s`-/" /tmp/build-dokku/var/lib/dokku/STABLE_VERSION && rm /tmp/build-dokku/var/lib/dokku/STABLE_VERSION.bak
 endif
 
 	@echo "-> Creating rpm package"
-	VERSION=$$(cat /tmp/build/var/lib/dokku/STABLE_VERSION); \
-	sudo fpm -t rpm -s dir -C /tmp/build -n dokku \
+	VERSION=$$(cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION); \
+	sudo fpm -t rpm -s dir -C /tmp/build-dokku -n dokku \
 		--version "$$VERSION" \
 		--architecture $(RPM_ARCHITECTURE) \
 		--package "$(BUILD_DIRECTORY)/$(DOKKU_RPM_PACKAGE_NAME)" \

From 71be7026d79e3ac7ef75644c850009715c2d006a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 12:41:48 -0400
Subject: [PATCH 029/163] fix: correct GetResourceValue errors

---
 plugins/resource/resource.go    | 30 ++++++++++++++++++++++++------
 plugins/resource/subcommands.go | 18 ------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index 0d8e0187f..cddb2cf9e 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -67,23 +67,24 @@ func ReportSingleApp(appName, infoFlag string) {
 	common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
 }
 
-func GetResourceValue(appName string, procType string, resourceType string, prefix string) (string, error) {
+// Fetches a single value for a given app/process/request/key combination
+func GetResourceValue(appName string, processType string, requestType string, key string) (string, error) {
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
 		return "", err
 	}
 
+	defaultValue := ""
 	for key, value := range resources {
-		parts := strings.SplitN(strings.TrimPrefix(key, prefix), ".", 2)
-		if parts[0] != resourceType {
-			return "", err
+		if key == propertyKey("_default_", requestType, key) {
+			defaultValue = value
 		}
-		if parts[1] == prefix {
+		if key == propertyKey(processType, requestType, key) {
 			return value, nil
 		}
 	}
 
-	return "", errors.New("No value found")
+	return defaultValue, nil
 }
 
 func times(str string, n int) (out string) {
@@ -97,3 +98,20 @@ func times(str string, n int) (out string) {
 func Right(str string, length int, pad string) string {
 	return str + times(pad, length-len(str))
 }
+
+func propertyKey(processType string, requestType string, key string) string {
+	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
+}
+
+func getAppName(args []string) (string, error) {
+	if len(args) < 1 {
+		return "", errors.New("Please specify an app to run the command on")
+	}
+
+	appName := args[0]
+	if err := common.VerifyAppName(appName); err != nil {
+		return "", err
+	}
+
+	return appName, nil
+}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 09a5dab73..2c0ced583 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -1,7 +1,6 @@
 package resource
 
 import (
-	"errors"
 	"fmt"
 	"github.com/dokku/dokku/plugins/common"
 )
@@ -169,20 +168,3 @@ func reportRequestType(appName string, processType string, requestType string) {
 	}
 	return
 }
-
-func propertyKey(processType string, requestType string, key string) string {
-	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
-}
-
-func getAppName(args []string) (string, error) {
-	if len(args) < 1 {
-		return "", errors.New("Please specify an app to run the command on")
-	}
-
-	appName := args[0]
-	if err := common.VerifyAppName(appName); err != nil {
-		return "", err
-	}
-
-	return appName, nil
-}

From 0af8b2421d2585fff7b54d93fb27ee20e23b9ffd Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 12:42:25 -0400
Subject: [PATCH 030/163] fix: correct range call

---
 plugins/resource/subcommands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 2c0ced583..fcb90be0d 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -62,7 +62,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 		if err != nil {
 			return err
 		}
-		for key, _ := range resources {
+		for key := range resources {
 			err := common.PropertyDelete("resource", appName, key)
 			if err != nil {
 				return err

From d7c7511ea9fe4678cbef05c837b16b24e3d0b529 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 12:52:30 -0400
Subject: [PATCH 031/163] fix: correct comment on GetResourceValue

---
 plugins/resource/resource.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index cddb2cf9e..fc6e17372 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -67,7 +67,7 @@ func ReportSingleApp(appName, infoFlag string) {
 	common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
 }
 
-// Fetches a single value for a given app/process/request/key combination
+// GetResourceValue fetches a single value for a given app/process/request/key combination
 func GetResourceValue(appName string, processType string, requestType string, key string) (string, error) {
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {

From ff945c64fea700c796c2fc20a9d6ccd3f0209c72 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 13:18:28 -0400
Subject: [PATCH 032/163] fix: correct local test running

---
 tests.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests.mk b/tests.mk
index 6638e6da6..d3b932782 100644
--- a/tests.mk
+++ b/tests.mk
@@ -71,7 +71,7 @@ endif
 ifneq ($(wildcard /etc/ssh/sshd_config),)
 ifeq ($(shell grep 22333 /etc/ssh/sshd_config),)
 	sed --in-place "s:^Port 22:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
-	restart ssh
+	service ssh restart
 endif
 endif
 

From 6cc6d5a33f8ed5e3d55f485cbb28dcdac200428b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 13:22:40 -0400
Subject: [PATCH 033/163] fix: correct port application during local tests

---
 tests.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests.mk b/tests.mk
index d3b932782..16a6fb2fd 100644
--- a/tests.mk
+++ b/tests.mk
@@ -71,6 +71,7 @@ endif
 ifneq ($(wildcard /etc/ssh/sshd_config),)
 ifeq ($(shell grep 22333 /etc/ssh/sshd_config),)
 	sed --in-place "s:^Port 22:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
+	sed --in-place "s:^#Port 22$:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
 	service ssh restart
 endif
 endif

From beef464cc19fe43500da20fb8e8a28309c7c3340 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 13:42:01 -0400
Subject: [PATCH 034/163] fix: only uncomment port for sshd-config

---
 tests.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests.mk b/tests.mk
index 16a6fb2fd..c42dc22b3 100644
--- a/tests.mk
+++ b/tests.mk
@@ -69,11 +69,11 @@ else ifeq ($(shell grep dokku.me /root/.ssh/config),)
 endif
 
 ifneq ($(wildcard /etc/ssh/sshd_config),)
+	sed --in-place "s/^#Port 22$\/Port 22/g" /etc/ssh/sshd_config
 ifeq ($(shell grep 22333 /etc/ssh/sshd_config),)
 	sed --in-place "s:^Port 22:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
-	sed --in-place "s:^#Port 22$:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
-	service ssh restart
 endif
+	service ssh restart
 endif
 
 	@echo "-----> Installing SSH public key..."

From 4a6d3c25a4ad4b8dfa786c7c34de9c7445950460 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 13:55:23 -0400
Subject: [PATCH 035/163] fix: do not crash when clearing properties

---
 plugins/resource/subcommands.go | 10 ++--------
 tests/unit/20_resource.bats     | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index fcb90be0d..568f0a769 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -63,10 +63,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 			return err
 		}
 		for key := range resources {
-			err := common.PropertyDelete("resource", appName, key)
-			if err != nil {
-				return err
-			}
+			common.PropertyDelete("resource", appName, key)
 		}
 	} else {
 		resources := []string{
@@ -80,10 +77,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 
 		for _, key := range resources {
 			property := propertyKey(processType, requestType, key)
-			err := common.PropertyDelete("resource", appName, property)
-			if err != nil {
-				return err
-			}
+			common.PropertyDelete("resource", appName, property)
 		}
 	}
 	return nil
diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index 372fad236..38b8729c8 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -135,3 +135,27 @@ teardown() {
   echo "status: $status"
   assert_output "0"
 }
+
+@test "(docker-options) resource:limit-clear" {
+  run /bin/bash -c "dokku resource:limit-clear $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku resource:limit-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
+@test "(docker-options) resource:reserve-clear" {
+  run /bin/bash -c "dokku resource:reserve-clear $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku resource:reserve-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}

From c41753c74777e17d66e04642f80ba397ede5816c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 14:17:16 -0400
Subject: [PATCH 036/163] fix: clearing resources for web doesn't actually
 clear for everything

---
 tests/unit/20_resource.bats | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index 38b8729c8..26eaac973 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -66,6 +66,18 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit-clear $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   dokku ps:rebuild "$TEST_APP"
   CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
@@ -128,6 +140,18 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve-clear $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   dokku ps:rebuild "$TEST_APP"
   CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"

From a4114bb29d3b8468e7497992353ed781067159d9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 14:30:50 -0400
Subject: [PATCH 037/163] fix: clearing values has no returnable errors

---
 plugins/resource/subcommands.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 568f0a769..82134fdbc 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -22,7 +22,8 @@ func CommandLimitClear(args []string, processType string) error {
 		return err
 	}
 
-	return clearByRequestType(appName, processType, "limit")
+	clearByRequestType(appName, processType, "limit")
+	return nil
 }
 
 // CommandReserve implements resource:reserve
@@ -42,10 +43,11 @@ func CommandReserveClear(args []string, processType string) error {
 		return err
 	}
 
-	return clearByRequestType(appName, processType, "reserve")
+	clearByRequestType(appName, processType, "reserve")
+	return nil
 }
 
-func clearByRequestType(appName string, processType string, requestType string) error {
+func clearByRequestType(appName string, processType string, requestType string) {
 	noun := "limits"
 	if requestType == "reserve" {
 		noun = "reservation"
@@ -60,7 +62,7 @@ func clearByRequestType(appName string, processType string, requestType string)
 	if processType == "" {
 		resources, err := common.PropertyGetAll("resource", appName)
 		if err != nil {
-			return err
+			return
 		}
 		for key := range resources {
 			common.PropertyDelete("resource", appName, key)
@@ -80,7 +82,6 @@ func clearByRequestType(appName string, processType string, requestType string)
 			common.PropertyDelete("resource", appName, property)
 		}
 	}
-	return nil
 }
 
 func setRequestType(appName string, processType string, r Resource, requestType string) error {

From b24697443a69bd819a58ad894630ef667c6d5428 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 15:18:46 -0400
Subject: [PATCH 038/163] fix: correct the name

---
 tests/unit/20_resource.bats | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index 26eaac973..a8f92cc89 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -12,7 +12,7 @@ teardown() {
   global_teardown
 }
 
-@test "(docker-options) resource:limit" {
+@test "(resource) resource:limit" {
   run /bin/bash -c "dokku resource:limit $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -86,7 +86,7 @@ teardown() {
   assert_output "0"
 }
 
-@test "(docker-options) resource:reserve" {
+@test "(resource) resource:reserve" {
   run /bin/bash -c "dokku resource:reserve $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -160,7 +160,7 @@ teardown() {
   assert_output "0"
 }
 
-@test "(docker-options) resource:limit-clear" {
+@test "(resource) resource:limit-clear" {
   run /bin/bash -c "dokku resource:limit-clear $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -172,7 +172,7 @@ teardown() {
   assert_success
 }
 
-@test "(docker-options) resource:reserve-clear" {
+@test "(resource) resource:reserve-clear" {
   run /bin/bash -c "dokku resource:reserve-clear $TEST_APP"
   echo "output: $output"
   echo "status: $status"

From a4c30c2ba908f7231245fd6c83047009880365f3 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 16:36:30 -0400
Subject: [PATCH 039/163] chore: standardize variable naming

---
 plugins/network/network.go                    | 20 ++++++-------
 .../network-compute-ports.go                  |  4 +--
 .../network-get-ipaddr/network-get-ipaddr.go  |  4 +--
 .../network-get-port/network-get-port.go      |  4 +--
 .../network-write-ipaddr.go                   |  4 +--
 .../network-write-port/network-write-port.go  |  4 +--
 plugins/resource/resource.go                  | 10 +++----
 .../docker-args-process-deploy.go             |  4 +--
 .../resource-get-property.go                  |  8 +++---
 plugins/resource/subcommands.go               | 28 +++++++++----------
 10 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/plugins/network/network.go b/plugins/network/network.go
index af44450d3..55a32c629 100644
--- a/plugins/network/network.go
+++ b/plugins/network/network.go
@@ -52,7 +52,7 @@ func BuildConfig(appName string) {
 		if len(procParts) != 2 {
 			continue
 		}
-		procType := procParts[0]
+		processType := procParts[0]
 		procCount, err := strconv.Atoi(procParts[1])
 		if err != nil {
 			continue
@@ -62,25 +62,25 @@ func BuildConfig(appName string) {
 		for containerIndex < procCount {
 			containerIndex++
 			containerIndexString := strconv.Itoa(containerIndex)
-			containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, procType, containerIndex)
+			containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, processType, containerIndex)
 
 			containerID := common.ReadFirstLine(containerIDFile)
 			if containerID == "" || !common.ContainerIsRunning(containerID) {
 				continue
 			}
 
-			ipAddress := GetContainerIpaddress(appName, procType, containerID)
-			port := GetContainerPort(appName, procType, isHerokuishContainer, containerID)
+			ipAddress := GetContainerIpaddress(appName, processType, containerID)
+			port := GetContainerPort(appName, processType, isHerokuishContainer, containerID)
 
 			if ipAddress != "" {
-				_, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, procType, containerIndexString, ipAddress).Output()
+				_, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, processType, containerIndexString, ipAddress).Output()
 				if err != nil {
 					common.LogWarn(err.Error())
 				}
 			}
 
 			if port != "" {
-				_, err := sh.Command("plugn", "trigger", "network-write-port", appName, procType, containerIndexString, port).Output()
+				_, err := sh.Command("plugn", "trigger", "network-write-port", appName, processType, containerIndexString, port).Output()
 				if err != nil {
 					common.LogWarn(err.Error())
 				}
@@ -90,8 +90,8 @@ func BuildConfig(appName string) {
 }
 
 // GetContainerIpaddress returns the ipaddr for a given app container
-func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string) {
-	if procType != "web" {
+func GetContainerIpaddress(appName, processType, containerID string) (ipAddr string) {
+	if processType != "web" {
 		return
 	}
 
@@ -109,8 +109,8 @@ func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string
 }
 
 // GetContainerPort returns the port for a given app container
-func GetContainerPort(appName, procType string, isHerokuishContainer bool, containerID string) (port string) {
-	if procType != "web" {
+func GetContainerPort(appName, processType string, isHerokuishContainer bool, containerID string) (port string) {
+	if processType != "web" {
 		return
 	}
 
diff --git a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go
index e83fc3620..b981c59b0 100644
--- a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go
+++ b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go
@@ -15,10 +15,10 @@ import (
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	isHerokuishContainer := common.ToBool(flag.Arg(2))
 
-	if procType != "web" {
+	if processType != "web" {
 		return
 	}
 
diff --git a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
index cfdb3bbfd..237526b64 100644
--- a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
+++ b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
@@ -12,9 +12,9 @@ import (
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	containerID := flag.Arg(2)
 
-	ipAddress := network.GetContainerIpaddress(appName, procType, containerID)
+	ipAddress := network.GetContainerIpaddress(appName, processType, containerID)
 	fmt.Fprintln(os.Stdout, ipAddress)
 }
diff --git a/plugins/network/src/triggers/network-get-port/network-get-port.go b/plugins/network/src/triggers/network-get-port/network-get-port.go
index 801bc88ff..389265da7 100644
--- a/plugins/network/src/triggers/network-get-port/network-get-port.go
+++ b/plugins/network/src/triggers/network-get-port/network-get-port.go
@@ -13,10 +13,10 @@ import (
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	isHerokuishContainer := common.ToBool(flag.Arg(2))
 	containerID := flag.Arg(3)
 
-	port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerID)
+	port := network.GetContainerPort(appName, processType, isHerokuishContainer, containerID)
 	fmt.Fprintln(os.Stdout, port)
 }
diff --git a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go
index b76ceb3af..3cf618120 100644
--- a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go
+++ b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go
@@ -13,7 +13,7 @@ import (
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	containerIndex := flag.Arg(2)
 	ip := flag.Arg(3)
 
@@ -26,7 +26,7 @@ func main() {
 	}
 
 	appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/")
-	filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, procType, containerIndex)
+	filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, processType, containerIndex)
 	f, err := os.Create(filename)
 	if err != nil {
 		common.LogFail(err.Error())
diff --git a/plugins/network/src/triggers/network-write-port/network-write-port.go b/plugins/network/src/triggers/network-write-port/network-write-port.go
index 2a8d45dff..e263cd786 100644
--- a/plugins/network/src/triggers/network-write-port/network-write-port.go
+++ b/plugins/network/src/triggers/network-write-port/network-write-port.go
@@ -13,7 +13,7 @@ import (
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	containerIndex := flag.Arg(2)
 	port := flag.Arg(3)
 
@@ -26,7 +26,7 @@ func main() {
 	}
 
 	appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/")
-	filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, procType, containerIndex)
+	filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, processType, containerIndex)
 	f, err := os.Create(filename)
 	if err != nil {
 		common.LogFail(err.Error())
diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index fc6e17372..bd299e58c 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -68,7 +68,7 @@ func ReportSingleApp(appName, infoFlag string) {
 }
 
 // GetResourceValue fetches a single value for a given app/process/request/key combination
-func GetResourceValue(appName string, processType string, requestType string, key string) (string, error) {
+func GetResourceValue(appName string, processType string, resourceType string, key string) (string, error) {
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
 		return "", err
@@ -76,10 +76,10 @@ func GetResourceValue(appName string, processType string, requestType string, ke
 
 	defaultValue := ""
 	for key, value := range resources {
-		if key == propertyKey("_default_", requestType, key) {
+		if key == propertyKey("_default_", resourceType, key) {
 			defaultValue = value
 		}
-		if key == propertyKey(processType, requestType, key) {
+		if key == propertyKey(processType, resourceType, key) {
 			return value, nil
 		}
 	}
@@ -99,8 +99,8 @@ func Right(str string, length int, pad string) string {
 	return str + times(pad, length-len(str))
 }
 
-func propertyKey(processType string, requestType string, key string) string {
-	return fmt.Sprintf("%v.%v.%v", processType, requestType, key)
+func propertyKey(processType string, resourceType string, key string) string {
+	return fmt.Sprintf("%v.%v.%v", processType, resourceType, key)
 }
 
 func getAppName(args []string) (string, error) {
diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
index 5b92d85df..76dec47e6 100644
--- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -19,7 +19,7 @@ func main() {
 
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(3)
+	processType := flag.Arg(3)
 
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
@@ -38,7 +38,7 @@ func main() {
 	validReservations := map[string]bool{
 		"memory": true,
 	}
-	validPrefixes := []string{"_default_.", fmt.Sprintf("%s.", procType)}
+	validPrefixes := []string{"_default_.", fmt.Sprintf("%s.", processType)}
 	for _, validPrefix := range validPrefixes {
 		for key, value := range resources {
 			if !strings.HasPrefix(key, validPrefix) {
diff --git a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
index d8b0759ba..53d22effc 100644
--- a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
+++ b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
@@ -9,15 +9,15 @@ import (
 	"github.com/dokku/dokku/plugins/resource"
 )
 
-// writes the resource property to stdout for a given app container
+// writes the resource key to stdout for a given app container
 func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
-	procType := flag.Arg(1)
+	processType := flag.Arg(1)
 	resourceType := flag.Arg(1)
-	property := flag.Arg(1)
+	key := flag.Arg(1)
 
-	value, err := resource.GetResourceValue(appName, procType, resourceType, property)
+	value, err := resource.GetResourceValue(appName, processType, resourceType, key)
 	if err != nil {
 		common.LogFail(err.Error())
 	}
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index 82134fdbc..f93a4672a 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -12,7 +12,7 @@ func CommandLimit(args []string, processType string, r Resource) error {
 		return err
 	}
 
-	return setRequestType(appName, processType, r, "limit")
+	return setResourceType(appName, processType, r, "limit")
 }
 
 // CommandLimitClear implements resource:limit-clear
@@ -22,7 +22,7 @@ func CommandLimitClear(args []string, processType string) error {
 		return err
 	}
 
-	clearByRequestType(appName, processType, "limit")
+	clearByResourceType(appName, processType, "limit")
 	return nil
 }
 
@@ -33,7 +33,7 @@ func CommandReserve(args []string, processType string, r Resource) error {
 		return err
 	}
 
-	return setRequestType(appName, processType, r, "reserve")
+	return setResourceType(appName, processType, r, "reserve")
 }
 
 // CommandReserveClear implements resource:reserve-clear
@@ -43,13 +43,13 @@ func CommandReserveClear(args []string, processType string) error {
 		return err
 	}
 
-	clearByRequestType(appName, processType, "reserve")
+	clearByResourceType(appName, processType, "reserve")
 	return nil
 }
 
-func clearByRequestType(appName string, processType string, requestType string) {
+func clearByResourceType(appName string, processType string, resourceType string) {
 	noun := "limits"
-	if requestType == "reserve" {
+	if resourceType == "reserve" {
 		noun = "reservation"
 	}
 
@@ -78,13 +78,13 @@ func clearByRequestType(appName string, processType string, requestType string)
 		}
 
 		for _, key := range resources {
-			property := propertyKey(processType, requestType, key)
+			property := propertyKey(processType, resourceType, key)
 			common.PropertyDelete("resource", appName, property)
 		}
 	}
 }
 
-func setRequestType(appName string, processType string, r Resource, requestType string) error {
+func setResourceType(appName string, processType string, r Resource, resourceType string) error {
 	if len(processType) == 0 {
 		processType = "_default_"
 	}
@@ -106,12 +106,12 @@ func setRequestType(appName string, processType string, r Resource, requestType
 	}
 
 	if !hasValues {
-		reportRequestType(appName, processType, requestType)
+		reportResourceType(appName, processType, resourceType)
 		return nil
 	}
 
 	noun := "limits"
-	if requestType == "reserve" {
+	if resourceType == "reserve" {
 		noun = "reservation"
 	}
 	message := fmt.Sprintf("Setting resource %v for %v", noun, appName)
@@ -125,7 +125,7 @@ func setRequestType(appName string, processType string, r Resource, requestType
 			common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
 		}
 
-		property := propertyKey(processType, requestType, key)
+		property := propertyKey(processType, resourceType, key)
 		err := common.PropertyWrite("resource", appName, property, value)
 		if err != nil {
 			return err
@@ -135,9 +135,9 @@ func setRequestType(appName string, processType string, r Resource, requestType
 	return nil
 }
 
-func reportRequestType(appName string, processType string, requestType string) {
+func reportResourceType(appName string, processType string, resourceType string) {
 	noun := "limits"
-	if requestType == "reserve" {
+	if resourceType == "reserve" {
 		noun = "reservation"
 	}
 
@@ -157,7 +157,7 @@ func reportRequestType(appName string, processType string, requestType string) {
 	}
 
 	for _, key := range resources {
-		property := propertyKey(processType, requestType, key)
+		property := propertyKey(processType, resourceType, key)
 		value := common.PropertyGet("resource", appName, property)
 		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
 	}

From 642c293d5aa4ec62ade40b085a0f57d075e204ae Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 8 Apr 2019 18:03:29 -0400
Subject: [PATCH 040/163] Release 0.15.0

# History

## 0.15.0

Install/update via the bootstrap script:

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

### Bug Fixes

- #3479: @josegonzalez Turn off logging for nginx validate configuration
- #3470: @josegonzalez fix: correct the argument for get_release_cmd

### New Features

- #3469: @josegonzalez Resource management
- #3466: @josegonzalez Quieter builds
- #3467: @josegonzalez feat: update golang in use for binary building
- #3465: @josegonzalez Vagrant VM Enhancements
- #3464: @josegonzalez Upgrade to go-procfile-util version 0.6.0
- #3463: @josegonzalez Implement version flags
- #3462: @josegonzalez Upgrade procfile-util
- #3449: @josegonzalez Only override the `WORKDIR` in copy_from_image if the image is `gliderlabs/herokuish` based
- #3461: @josegonzalez Allow skipping aws releases for plugins
- #3459: @josegonzalez Upgrade to herokuish:0.4.9
- #3413: @josegonzalez Implement buildpacks plugin

### Documentation

- #3482: @multikatt rails-database -> railsdatabase
- #3476: @lazyatom Add chrome plugin to documentation
- #3468: @josegonzalez Doc cleanup

### Other

- #3471: @josegonzalez chore: drop plugn package building
---
 HISTORY.md                                 | 38 ++++++++++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 contrib/release-dokku                      |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  | 25 +++++------
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 42 files changed, 162 insertions(+), 123 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 0dcc7c5d1..b1153a018 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,43 @@
 # History
 
+## 0.15.0
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh
+sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3479: @josegonzalez Turn off logging for nginx validate configuration
+- #3470: @josegonzalez fix: correct the argument for get_release_cmd
+
+### New Features
+
+- #3469: @josegonzalez Resource management
+- #3466: @josegonzalez Quieter builds
+- #3467: @josegonzalez feat: update golang in use for binary building
+- #3465: @josegonzalez Vagrant VM Enhancements
+- #3464: @josegonzalez Upgrade to go-procfile-util version 0.6.0
+- #3463: @josegonzalez Implement version flags
+- #3462: @josegonzalez Upgrade procfile-util
+- #3449: @josegonzalez Only override the `WORKDIR` in copy_from_image if the image is `gliderlabs/herokuish` based
+- #3461: @josegonzalez Allow skipping aws releases for plugins
+- #3459: @josegonzalez Upgrade to herokuish:0.4.9
+- #3413: @josegonzalez Implement buildpacks plugin
+
+### Documentation
+
+- #3482: @multikatt rails-database -> railsdatabase
+- #3476: @lazyatom Add chrome plugin to documentation
+- #3468: @josegonzalez Doc cleanup
+
+### Other
+
+- #3471: @josegonzalez chore: drop plugn package building
+
 ## 0.14.6
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 02e3f97b0..03223d64b 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.14.6/bootstrap.sh
-sudo DOKKU_TAG=v0.14.6 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh
+sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index afd791b67..8fbd4818c 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.14.6'
+VERSION = 'v0.15.0'
 
 hostname = ''
 try:
diff --git a/contrib/release-dokku b/contrib/release-dokku
index fcb6be588..f88f01a92 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -219,7 +219,7 @@ fn-repo-update() {
   if [[ "$RELEASE" == 'patch' ]]; then
     fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json
   else
-    versions=$(python -c 'import json,sys;d=json.load(sys.stdin);d["max-versions"].append("'"${NEXT_VERSION}"'"); print json.dumps(d, indent=2, sort_keys=True)' <docs/assets/versions.json)
+    versions=$(python -c 'import json,sys;d=json.load(sys.stdin);d["max-versions"].append("'"${NEXT_VERSION}"'"); print(json.dumps(d, indent=2, sort_keys=True))' <docs/assets/versions.json)
     echo "$versions" >docs/assets/versions.json
     git add docs/assets/versions.json
   fi
diff --git a/debian/control b/debian/control
index 31f00b7d9..e2b70f4c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.14.6
+Version: 0.15.0
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 636b26c07..883794abe 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.14.6 enabled    dokku core standard plugin
-  20_events            0.14.6 enabled    dokku core events logging plugin
-  apps                 0.14.6 enabled    dokku core apps plugin
-  build-env            0.14.6 enabled    dokku core build-env plugin
-  certs                0.14.6 enabled    dokku core certificate management plugin
-  checks               0.14.6 enabled    dokku core checks plugin
-  common               0.14.6 enabled    dokku core common plugin
-  config               0.14.6 enabled    dokku core config plugin
-  docker-options       0.14.6 enabled    dokku core docker-options plugin
-  domains              0.14.6 enabled    dokku core domains plugin
-  enter                0.14.6 enabled    dokku core enter plugin
-  git                  0.14.6 enabled    dokku core git plugin
-  logs                 0.14.6 enabled    dokku core logs plugin
-  named-containers     0.14.6 enabled    dokku core named containers plugin
-  network              0.14.6 enabled    dokku core network plugin
-  nginx-vhosts         0.14.6 enabled    dokku core nginx-vhosts plugin
-  plugin               0.14.6 enabled    dokku core plugin plugin
-  proxy                0.14.6 enabled    dokku core proxy plugin
-  ps                   0.14.6 enabled    dokku core ps plugin
-  repo                 0.14.6 enabled    dokku core repo plugin
-  shell                0.14.6 enabled    dokku core shell plugin
-  ssh-keys             0.14.6 enabled    dokku core ssh-keys plugin
-  storage              0.14.6 enabled    dokku core storage plugin
-  tags                 0.14.6 enabled    dokku core tags plugin
-  tar                  0.14.6 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.0 enabled    dokku core standard plugin
+  20_events            0.15.0 enabled    dokku core events logging plugin
+  apps                 0.15.0 enabled    dokku core apps plugin
+  build-env            0.15.0 enabled    dokku core build-env plugin
+  certs                0.15.0 enabled    dokku core certificate management plugin
+  checks               0.15.0 enabled    dokku core checks plugin
+  common               0.15.0 enabled    dokku core common plugin
+  config               0.15.0 enabled    dokku core config plugin
+  docker-options       0.15.0 enabled    dokku core docker-options plugin
+  domains              0.15.0 enabled    dokku core domains plugin
+  enter                0.15.0 enabled    dokku core enter plugin
+  git                  0.15.0 enabled    dokku core git plugin
+  logs                 0.15.0 enabled    dokku core logs plugin
+  named-containers     0.15.0 enabled    dokku core named containers plugin
+  network              0.15.0 enabled    dokku core network plugin
+  nginx-vhosts         0.15.0 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.0 enabled    dokku core plugin plugin
+  proxy                0.15.0 enabled    dokku core proxy plugin
+  ps                   0.15.0 enabled    dokku core ps plugin
+  repo                 0.15.0 enabled    dokku core repo plugin
+  shell                0.15.0 enabled    dokku core shell plugin
+  ssh-keys             0.15.0 enabled    dokku core ssh-keys plugin
+  storage              0.15.0 enabled    dokku core storage plugin
+  tags                 0.15.0 enabled    dokku core tags plugin
+  tar                  0.15.0 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index b1641bf1c..10846ab7d 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index aa374f086..9730cc718 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index b85b033af..0fcff8835 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 9cdd57b90..d9210e3d7 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -1,16 +1,17 @@
 {
   "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.6"
+    "0.3.26",
+    "0.4.14",
+    "0.5.8",
+    "0.6.5",
+    "0.7.2",
+    "0.8.2",
+    "0.9.4",
+    "0.10.5",
+    "0.11.6",
+    "0.12.13",
+    "0.13.4",
+    "0.14.6",
+    "0.15.0"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 443ee1ba9..187f0547b 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.14.6-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.0-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 4b73d51fe..8b3cd55d6 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.14.6/bootstrap.sh;
-sudo DOKKU_TAG=v0.14.6 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 5325f1e7b..a9d0c9266 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/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.6/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.6/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.6/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.6/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.6/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.6/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.6/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.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/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.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.6/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.14.6 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 5847a8fb1..0752f01b4 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/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.6/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.6/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.6/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.6/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.6/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.6/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.6/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.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/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.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.6/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 5d98a342b..365689afc 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 47d0e43b3..ebbf7f28f 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 65ced2400..1991632df 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 8ad8cfd18..89bf64527 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 3c364f3aa..3f6df906d 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 8804437b6..4665feaee 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index d1eb19fcf..89ee157d8 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 7ea521430..2a27d6246 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 6914cbf8f..335894245 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index ee7a45a24..0e72fc6df 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 2607e426c..62a231138 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index f6a1f2827..d2212b502 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index cdcd5fbdd..b78b8e3c1 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 686092618..1406b0992 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index a3a42efa0..ca2722203 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 8456752da..4964dd108 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 9989d75c4..fc4f5be8b 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 4ea7de804..0c217f637 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index e8b207121..621574ce9 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 9bc6063fd..19f52e78a 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 66e3c750d..e3636b7d8 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 3e302605c..6327841d3 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index f8e3c5236..1e3fa4f73 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 4adb0b2c1..3258e7fe0 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index c4e2cc3f5..84310243d 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 38d34477f..e2b098105 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index a745009d7..819ac7312 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 1b2a835c8..6718e57be 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.14.6"
+version = "0.15.0"
 [plugin.config]

From 929c98ee90f42a93b73613c5c5b24ae0add391ea Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 02:41:02 -0400
Subject: [PATCH 041/163] fix: ensure 'dokku report' always succeeds for any
 app

---
 plugins/buildpacks/.gitignore |  1 +
 plugins/resource/resource.go  |  2 +-
 tests/unit/40_report.bats     | 48 +++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/40_report.bats

diff --git a/plugins/buildpacks/.gitignore b/plugins/buildpacks/.gitignore
index 56aebe3b7..cd4903d6f 100644
--- a/plugins/buildpacks/.gitignore
+++ b/plugins/buildpacks/.gitignore
@@ -3,4 +3,5 @@
 /triggers/*
 /install
 /post-delete
+/post-extract
 /report
diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index bd299e58c..526589cca 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -29,7 +29,7 @@ func ReportSingleApp(appName, infoFlag string) {
 
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
-		common.LogFail(err.Error())
+		return
 	}
 
 	flags := []string{}
diff --git a/tests/unit/40_report.bats b/tests/unit/40_report.bats
new file mode 100644
index 000000000..c2fcec125
--- /dev/null
+++ b/tests/unit/40_report.bats
@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  deploy_app
+}
+
+teardown() {
+  destroy_app
+  global_teardown
+}
+
+@test "(buildpacks) report" {
+  run /bin/bash -c "dokku report"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "herokuish version:"
+  assert_success
+
+  run /bin/bash -c "dokku report $TEST_APP 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "herokuish version:"
+  assert_output_contains "not deployed" "0"
+  assert_success
+
+  run /bin/bash -c "dokku report fake-app-name"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku report fake-app-name 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "App fake-app-name does not exist"
+  assert_failure
+
+  dokku apps:create "${TEST_APP}-2"
+  run /bin/bash -c "dokku report ${TEST_APP}-2 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "not deployed"
+  assert_success
+
+  dokku --force apps:destroy "${TEST_APP}-2"
+}

From ecd88fbeeb4276a0ff9e2222e9fa22b89568b3a0 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 03:18:28 -0400
Subject: [PATCH 042/163] fix: correctly name the testcase

---
 tests/unit/40_report.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/40_report.bats b/tests/unit/40_report.bats
index c2fcec125..a6daecec7 100644
--- a/tests/unit/40_report.bats
+++ b/tests/unit/40_report.bats
@@ -12,7 +12,7 @@ teardown() {
   global_teardown
 }
 
-@test "(buildpacks) report" {
+@test "(report) report" {
   run /bin/bash -c "dokku report"
   echo "output: $output"
   echo "status: $status"

From b120a9cc5734492b7e39ced5e26be707c7d308a9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 03:19:40 -0400
Subject: [PATCH 043/163] Release 0.15.1

# History

## 0.15.1

Install/update via the bootstrap script:

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

### Bug Fixes

- #3485: @josegonzalez fix: ensure 'dokku report' always succeeds for any app
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 124 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index b1153a018..1d611d4ec 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.15.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh
+sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3485: @josegonzalez fix: ensure 'dokku report' always succeeds for any app
+
 ## 0.15.0
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 03223d64b..7e17597d1 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh
-sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh
+sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 8fbd4818c..880c055db 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.0'
+VERSION = 'v0.15.1'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index e2b70f4c9..e0dfa6835 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.0
+Version: 0.15.1
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 883794abe..e40ec130b 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.0 enabled    dokku core standard plugin
-  20_events            0.15.0 enabled    dokku core events logging plugin
-  apps                 0.15.0 enabled    dokku core apps plugin
-  build-env            0.15.0 enabled    dokku core build-env plugin
-  certs                0.15.0 enabled    dokku core certificate management plugin
-  checks               0.15.0 enabled    dokku core checks plugin
-  common               0.15.0 enabled    dokku core common plugin
-  config               0.15.0 enabled    dokku core config plugin
-  docker-options       0.15.0 enabled    dokku core docker-options plugin
-  domains              0.15.0 enabled    dokku core domains plugin
-  enter                0.15.0 enabled    dokku core enter plugin
-  git                  0.15.0 enabled    dokku core git plugin
-  logs                 0.15.0 enabled    dokku core logs plugin
-  named-containers     0.15.0 enabled    dokku core named containers plugin
-  network              0.15.0 enabled    dokku core network plugin
-  nginx-vhosts         0.15.0 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.0 enabled    dokku core plugin plugin
-  proxy                0.15.0 enabled    dokku core proxy plugin
-  ps                   0.15.0 enabled    dokku core ps plugin
-  repo                 0.15.0 enabled    dokku core repo plugin
-  shell                0.15.0 enabled    dokku core shell plugin
-  ssh-keys             0.15.0 enabled    dokku core ssh-keys plugin
-  storage              0.15.0 enabled    dokku core storage plugin
-  tags                 0.15.0 enabled    dokku core tags plugin
-  tar                  0.15.0 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.1 enabled    dokku core standard plugin
+  20_events            0.15.1 enabled    dokku core events logging plugin
+  apps                 0.15.1 enabled    dokku core apps plugin
+  build-env            0.15.1 enabled    dokku core build-env plugin
+  certs                0.15.1 enabled    dokku core certificate management plugin
+  checks               0.15.1 enabled    dokku core checks plugin
+  common               0.15.1 enabled    dokku core common plugin
+  config               0.15.1 enabled    dokku core config plugin
+  docker-options       0.15.1 enabled    dokku core docker-options plugin
+  domains              0.15.1 enabled    dokku core domains plugin
+  enter                0.15.1 enabled    dokku core enter plugin
+  git                  0.15.1 enabled    dokku core git plugin
+  logs                 0.15.1 enabled    dokku core logs plugin
+  named-containers     0.15.1 enabled    dokku core named containers plugin
+  network              0.15.1 enabled    dokku core network plugin
+  nginx-vhosts         0.15.1 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.1 enabled    dokku core plugin plugin
+  proxy                0.15.1 enabled    dokku core proxy plugin
+  ps                   0.15.1 enabled    dokku core ps plugin
+  repo                 0.15.1 enabled    dokku core repo plugin
+  shell                0.15.1 enabled    dokku core shell plugin
+  ssh-keys             0.15.1 enabled    dokku core ssh-keys plugin
+  storage              0.15.1 enabled    dokku core storage plugin
+  tags                 0.15.1 enabled    dokku core tags plugin
+  tar                  0.15.1 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 10846ab7d..6e4848efc 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 9730cc718..b6036b039 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 0fcff8835..b4f15b56c 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index d9210e3d7..1e6582f0a 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,6 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.0"
+    "0.15.1"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 187f0547b..f294ec195 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.1-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 8b3cd55d6..663b67fe7 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index a9d0c9266..33c0d9d3f 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 0752f01b4..909471a33 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 365689afc..1dba3fb0e 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index ebbf7f28f..722cfec02 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 1991632df..6bcbd1a5e 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 89bf64527..916c994a4 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 3f6df906d..9cb817a98 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 4665feaee..22ea25745 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 89ee157d8..a4c20764d 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 2a27d6246..008dd6c9e 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 335894245..fea334318 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 0e72fc6df..f14873d2f 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 62a231138..b704b3bc2 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index d2212b502..eae4f2499 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index b78b8e3c1..c6a35633e 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 1406b0992..aae6a9c71 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index ca2722203..8cacd537f 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 4964dd108..af812114d 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index fc4f5be8b..1a23499b2 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 0c217f637..fde1ba923 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 621574ce9..25360316b 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 19f52e78a..876b5fea4 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index e3636b7d8..41a9efe4e 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 6327841d3..cbe9a5aba 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 1e3fa4f73..a6052e53c 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 3258e7fe0..8bda92ab4 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 84310243d..fa4a216a5 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index e2b098105..591902cf7 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 819ac7312..213884ae9 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 6718e57be..159dd05f7 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.0"
+version = "0.15.1"
 [plugin.config]

From 75239ae8b5a1d248d0bb4dd3e3dc669dd37e3de2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 06:18:16 -0400
Subject: [PATCH 044/163] fix: call ps:retire from system service

[ci skip]
---
 plugins/scheduler-docker-local/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scheduler-docker-local/install b/plugins/scheduler-docker-local/install
index 2dfdda4a6..174853aa8 100755
--- a/plugins/scheduler-docker-local/install
+++ b/plugins/scheduler-docker-local/install
@@ -26,7 +26,7 @@ After=docker.service
 [Service]
 Type=oneshot
 User=$DOKKU_SYSTEM_USER
-ExecStart=$DOKKU_PATH ps:restore
+ExecStart=$DOKKU_PATH ps:retire
 
 [Install]
 WantedBy=docker.service

From 286c6ed39d6e0321565d7164721fab2be1707f82 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 06:18:54 -0400
Subject: [PATCH 045/163] Release 0.15.2

# History

## 0.15.2

Install/update via the bootstrap script:

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

### Bug Fixes

- #3488: @josegonzalez fix: call ps:retire from system service
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 124 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 1d611d4ec..2b75efcff 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.15.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh
+sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3488: @josegonzalez fix: call ps:retire from system service
+
 ## 0.15.1
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 7e17597d1..b97707ca6 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh
-sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh
+sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 880c055db..c3969418d 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.1'
+VERSION = 'v0.15.2'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index e0dfa6835..73d2d3ab4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.1
+Version: 0.15.2
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index e40ec130b..2d6d0f396 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.1 enabled    dokku core standard plugin
-  20_events            0.15.1 enabled    dokku core events logging plugin
-  apps                 0.15.1 enabled    dokku core apps plugin
-  build-env            0.15.1 enabled    dokku core build-env plugin
-  certs                0.15.1 enabled    dokku core certificate management plugin
-  checks               0.15.1 enabled    dokku core checks plugin
-  common               0.15.1 enabled    dokku core common plugin
-  config               0.15.1 enabled    dokku core config plugin
-  docker-options       0.15.1 enabled    dokku core docker-options plugin
-  domains              0.15.1 enabled    dokku core domains plugin
-  enter                0.15.1 enabled    dokku core enter plugin
-  git                  0.15.1 enabled    dokku core git plugin
-  logs                 0.15.1 enabled    dokku core logs plugin
-  named-containers     0.15.1 enabled    dokku core named containers plugin
-  network              0.15.1 enabled    dokku core network plugin
-  nginx-vhosts         0.15.1 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.1 enabled    dokku core plugin plugin
-  proxy                0.15.1 enabled    dokku core proxy plugin
-  ps                   0.15.1 enabled    dokku core ps plugin
-  repo                 0.15.1 enabled    dokku core repo plugin
-  shell                0.15.1 enabled    dokku core shell plugin
-  ssh-keys             0.15.1 enabled    dokku core ssh-keys plugin
-  storage              0.15.1 enabled    dokku core storage plugin
-  tags                 0.15.1 enabled    dokku core tags plugin
-  tar                  0.15.1 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.2 enabled    dokku core standard plugin
+  20_events            0.15.2 enabled    dokku core events logging plugin
+  apps                 0.15.2 enabled    dokku core apps plugin
+  build-env            0.15.2 enabled    dokku core build-env plugin
+  certs                0.15.2 enabled    dokku core certificate management plugin
+  checks               0.15.2 enabled    dokku core checks plugin
+  common               0.15.2 enabled    dokku core common plugin
+  config               0.15.2 enabled    dokku core config plugin
+  docker-options       0.15.2 enabled    dokku core docker-options plugin
+  domains              0.15.2 enabled    dokku core domains plugin
+  enter                0.15.2 enabled    dokku core enter plugin
+  git                  0.15.2 enabled    dokku core git plugin
+  logs                 0.15.2 enabled    dokku core logs plugin
+  named-containers     0.15.2 enabled    dokku core named containers plugin
+  network              0.15.2 enabled    dokku core network plugin
+  nginx-vhosts         0.15.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.2 enabled    dokku core plugin plugin
+  proxy                0.15.2 enabled    dokku core proxy plugin
+  ps                   0.15.2 enabled    dokku core ps plugin
+  repo                 0.15.2 enabled    dokku core repo plugin
+  shell                0.15.2 enabled    dokku core shell plugin
+  ssh-keys             0.15.2 enabled    dokku core ssh-keys plugin
+  storage              0.15.2 enabled    dokku core storage plugin
+  tags                 0.15.2 enabled    dokku core tags plugin
+  tar                  0.15.2 enabled    dokku core tar plugin
 ```
 
 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 6e4848efc..2fa93bdef 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index b6036b039..fb7a75799 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index b4f15b56c..f014cfed0 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 1e6582f0a..55d447922 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,6 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.1"
+    "0.15.2"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index f294ec195..c656d835d 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.1-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 663b67fe7..83179413d 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 33c0d9d3f..9a36bc2b4 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.1/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.1 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 909471a33..337d0debe 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 1dba3fb0e..43be22ac0 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 722cfec02..dc387c067 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 6bcbd1a5e..e0dee8845 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 916c994a4..c3eeaa433 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 9cb817a98..38dc52a8a 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 22ea25745..ad6ce07c1 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index a4c20764d..8fa62cad5 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 008dd6c9e..1c44512ea 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index fea334318..7cc42c24e 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index f14873d2f..f9006f6f0 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index b704b3bc2..15a9704a0 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index eae4f2499..3382eba41 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index c6a35633e..2fe5a9068 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index aae6a9c71..3a2b932bf 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 8cacd537f..6c4e357ca 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index af812114d..20fc4bbc6 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 1a23499b2..d122527f6 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index fde1ba923..66828218c 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 25360316b..15559bd01 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 876b5fea4..f19386e68 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 41a9efe4e..0cf07a4af 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index cbe9a5aba..f069e5bac 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index a6052e53c..832ee7d40 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 8bda92ab4..2d96e2fcd 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index fa4a216a5..1c5b773ce 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 591902cf7..2cb39813d 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 213884ae9..bf7d3d74e 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 159dd05f7..558e72bb3 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.1"
+version = "0.15.2"
 [plugin.config]

From ef5f7fe03e1c5d895ac4f09507918ab4731c5a4a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 06:55:34 -0400
Subject: [PATCH 046/163] feat: upgrade herokuish to 0.5.0 (Ubuntu 18.04)

This moves the base image from Xenial to Bionic, which is the latest supported LTS release of Ubuntu. Note that all previous releases of herokuish are no longer supported, and users are encouraged to upgrade where possible.

In the case of upgrades, a 'dokku repo:purge-cache APP' should be called for each app, or built applications may include code linked to non-ABI compatible libraries due to the OS upgrade.

This sort of change is usually performed _only_ during a minor release, but as the window since the release is fairly small, the risk to our users is negligible in comparison to the inability to stay on a maintained herokuish release.
---
 deb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deb.mk b/deb.mk
index 016139c4d..fa8ce972f 100644
--- a/deb.mk
+++ b/deb.mk
@@ -2,7 +2,7 @@ BUILD_DIRECTORY ?= /tmp
 
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.4.9
+HEROKUISH_VERSION ?= 0.5.0
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 

From 97649e86dd5213def0f5dbbd5c064c644e5e600f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 07:27:30 -0400
Subject: [PATCH 047/163] fix: update ruby version

---
 tests/apps/multi/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/apps/multi/Gemfile b/tests/apps/multi/Gemfile
index 6d078ad4d..e30d42237 100644
--- a/tests/apps/multi/Gemfile
+++ b/tests/apps/multi/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby '2.2.4'
+ruby '2.6.2'
 
 gem 'compass', ">= 1.0.1"
 gem 'sass-globbing'

From 5b9e8ddb7d02e65ac2e5be9d38e243bbc87d3d6e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 9 Apr 2019 11:40:30 -0400
Subject: [PATCH 048/163] Release 0.15.3

# History

## 0.15.3

Install/update via the bootstrap script:

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

### New Features

- #3489: @josegonzalez feat: upgrade herokuish to 0.5.0 (Ubuntu 18.04)
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 124 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 2b75efcff..9720c64e1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.15.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh
+sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh
+```
+
+### New Features
+
+- #3489: @josegonzalez feat: upgrade herokuish to 0.5.0 (Ubuntu 18.04)
+
 ## 0.15.2
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index b97707ca6..16bfc84f3 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh
-sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh
+sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index c3969418d..3ac0f071a 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.2'
+VERSION = 'v0.15.3'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 73d2d3ab4..6d54806a1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.2
+Version: 0.15.3
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 2d6d0f396..7361b1424 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.2 enabled    dokku core standard plugin
-  20_events            0.15.2 enabled    dokku core events logging plugin
-  apps                 0.15.2 enabled    dokku core apps plugin
-  build-env            0.15.2 enabled    dokku core build-env plugin
-  certs                0.15.2 enabled    dokku core certificate management plugin
-  checks               0.15.2 enabled    dokku core checks plugin
-  common               0.15.2 enabled    dokku core common plugin
-  config               0.15.2 enabled    dokku core config plugin
-  docker-options       0.15.2 enabled    dokku core docker-options plugin
-  domains              0.15.2 enabled    dokku core domains plugin
-  enter                0.15.2 enabled    dokku core enter plugin
-  git                  0.15.2 enabled    dokku core git plugin
-  logs                 0.15.2 enabled    dokku core logs plugin
-  named-containers     0.15.2 enabled    dokku core named containers plugin
-  network              0.15.2 enabled    dokku core network plugin
-  nginx-vhosts         0.15.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.2 enabled    dokku core plugin plugin
-  proxy                0.15.2 enabled    dokku core proxy plugin
-  ps                   0.15.2 enabled    dokku core ps plugin
-  repo                 0.15.2 enabled    dokku core repo plugin
-  shell                0.15.2 enabled    dokku core shell plugin
-  ssh-keys             0.15.2 enabled    dokku core ssh-keys plugin
-  storage              0.15.2 enabled    dokku core storage plugin
-  tags                 0.15.2 enabled    dokku core tags plugin
-  tar                  0.15.2 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.3 enabled    dokku core standard plugin
+  20_events            0.15.3 enabled    dokku core events logging plugin
+  apps                 0.15.3 enabled    dokku core apps plugin
+  build-env            0.15.3 enabled    dokku core build-env plugin
+  certs                0.15.3 enabled    dokku core certificate management plugin
+  checks               0.15.3 enabled    dokku core checks plugin
+  common               0.15.3 enabled    dokku core common plugin
+  config               0.15.3 enabled    dokku core config plugin
+  docker-options       0.15.3 enabled    dokku core docker-options plugin
+  domains              0.15.3 enabled    dokku core domains plugin
+  enter                0.15.3 enabled    dokku core enter plugin
+  git                  0.15.3 enabled    dokku core git plugin
+  logs                 0.15.3 enabled    dokku core logs plugin
+  named-containers     0.15.3 enabled    dokku core named containers plugin
+  network              0.15.3 enabled    dokku core network plugin
+  nginx-vhosts         0.15.3 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.3 enabled    dokku core plugin plugin
+  proxy                0.15.3 enabled    dokku core proxy plugin
+  ps                   0.15.3 enabled    dokku core ps plugin
+  repo                 0.15.3 enabled    dokku core repo plugin
+  shell                0.15.3 enabled    dokku core shell plugin
+  ssh-keys             0.15.3 enabled    dokku core ssh-keys plugin
+  storage              0.15.3 enabled    dokku core storage plugin
+  tags                 0.15.3 enabled    dokku core tags plugin
+  tar                  0.15.3 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 2fa93bdef..de7b5fa9f 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index fb7a75799..f30aa7191 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index f014cfed0..4e083858a 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 55d447922..28864f1dc 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,6 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.2"
+    "0.15.3"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index c656d835d..be6744b25 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.3-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 83179413d..e6f866974 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 9a36bc2b4..83414a5cb 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 337d0debe..2a0a99d59 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 43be22ac0..601257382 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index dc387c067..9586d234a 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index e0dee8845..f22f738a2 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index c3eeaa433..85de1bf39 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 38dc52a8a..c3879c0e8 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index ad6ce07c1..835386b7b 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 8fa62cad5..8a33fdb07 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 1c44512ea..bccc5b3f1 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 7cc42c24e..e85c4d284 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index f9006f6f0..4e1d05244 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 15a9704a0..619e6a60e 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 3382eba41..dafa061b2 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 2fe5a9068..30170f07c 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 3a2b932bf..902b521f1 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 6c4e357ca..e0be9b4c7 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 20fc4bbc6..ece0aaae2 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index d122527f6..9e4e8fab7 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 66828218c..42d39033a 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 15559bd01..9c049dd49 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index f19386e68..d473b427e 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 0cf07a4af..7baf994e1 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index f069e5bac..866d1a66a 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 832ee7d40..bbfa1addf 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 2d96e2fcd..bee5f3687 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 1c5b773ce..012fc5249 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 2cb39813d..5091bad64 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index bf7d3d74e..bd6753bfe 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 558e72bb3..ff4e62c47 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.2"
+version = "0.15.3"
 [plugin.config]

From 3a7bac62183e22dfd1c64053f662fa4a74a8f5ac Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 10 Apr 2019 00:44:25 -0400
Subject: [PATCH 049/163] docs: Add missing link to resource management docs

[ci skip]
---
 docs/template.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/template.html b/docs/template.html
index 2a0a99d59..ddabd9605 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -157,6 +157,7 @@
             <a href="/{{NAME}}/advanced-usage/persistent-storage/" class="list-group-item">Persistent Storage</a>
             <a href="/{{NAME}}/advanced-usage/plugin-management/" class="list-group-item">Plugin Management</a>
             <a href="/{{NAME}}/advanced-usage/repository-management/" class="list-group-item">Repository Management</a>
+            <a href="/{{NAME}}/advanced-usage/resource-management/" class="list-group-item">Resource Management</a>
 
             <a href="#" class="list-group-item disabled">Schedulers</a>
 

From bf8b67b35da32a903894a02ba4dd9c354629c2b2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 16 Apr 2019 20:00:35 -0400
Subject: [PATCH 050/163] feat: cleanup glide plugins when running src-clean

---
 plugins/buildpacks/Makefile | 2 +-
 plugins/config/Makefile     | 2 +-
 plugins/network/Makefile    | 2 +-
 plugins/repo/Makefile       | 2 +-
 plugins/resource/Makefile   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/buildpacks/Makefile b/plugins/buildpacks/Makefile
index 635403632..889c22529 100644
--- a/plugins/buildpacks/Makefile
+++ b/plugins/buildpacks/Makefile
@@ -26,7 +26,7 @@ clean:
 	rm -rf commands subcommands triggers install post-delete post-extract report
 
 src-clean:
-	rm -rf .gitignore src triggers vendor Makefile *.go
+	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
 
 triggers: $(TRIGGERS)
 
diff --git a/plugins/config/Makefile b/plugins/config/Makefile
index ccb9e826d..5e65eb98e 100644
--- a/plugins/config/Makefile
+++ b/plugins/config/Makefile
@@ -25,4 +25,4 @@ clean:
 	rm -rf commands subcommands
 
 src-clean:
-	rm -rf .gitignore src triggers vendor Makefile *.go
+	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
diff --git a/plugins/network/Makefile b/plugins/network/Makefile
index 36f189b92..813234501 100644
--- a/plugins/network/Makefile
+++ b/plugins/network/Makefile
@@ -26,7 +26,7 @@ clean:
 	rm -rf commands subcommands triggers network-* install post-app-clone-setup post-create post-delete report
 
 src-clean:
-	rm -rf .gitignore src triggers vendor Makefile *.go
+	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
 
 triggers: $(TRIGGERS)
 
diff --git a/plugins/repo/Makefile b/plugins/repo/Makefile
index 4c9c8bcae..2b7be509a 100644
--- a/plugins/repo/Makefile
+++ b/plugins/repo/Makefile
@@ -25,4 +25,4 @@ clean:
 	rm -rf commands subcommands
 
 src-clean:
-	rm -rf .gitignore src triggers vendor Makefile *.go
+	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
diff --git a/plugins/resource/Makefile b/plugins/resource/Makefile
index 6859e0283..3a2bf7315 100644
--- a/plugins/resource/Makefile
+++ b/plugins/resource/Makefile
@@ -26,7 +26,7 @@ clean:
 	rm -rf commands subcommands triggers docker-args-process-deploy docker-args-process-run install post-delete report resource-get-property
 
 src-clean:
-	rm -rf .gitignore src triggers vendor Makefile *.go
+	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
 
 triggers: $(TRIGGERS)
 

From 65e82bcea17f682dcdfa88a7473d4ff43821c926 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 16 Apr 2019 21:24:56 -0400
Subject: [PATCH 051/163] fix: allow reporting domains when there are none
 specified

This previously bailed if the response was empty, which in this case is incorrect, as the response isn't based on whether the app is deployed or not.
---
 plugins/domains/internal-functions |  1 -
 tests/unit/20_domains.bats         | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions
index f93d51429..74b1661e2 100755
--- a/plugins/domains/internal-functions
+++ b/plugins/domains/internal-functions
@@ -63,7 +63,6 @@ cmd-domains-report-single() {
       fi
     done
     [[ "$match" == "true" ]] || dokku_log_fail "Invalid flag passed, valid flags:${valid_flags}"
-    [[ "$value_exists" == "true" ]] || dokku_log_fail "not deployed"
   fi
 }
 
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 8c05f8994..3f736890c 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -173,6 +173,11 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  run /bin/bash -c "dokku domains:report $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku domains:clear $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -183,6 +188,11 @@ teardown() {
   echo "status: $status"
   assert_success
   refute_line test.app.dokku.me
+
+  run /bin/bash -c "dokku domains:report $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
 }
 
 @test "(domains) domains:add-global" {

From 887c0ebdd6797f7c2fa7aafe5b69a874e87a9e66 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 16 Apr 2019 21:23:45 -0400
Subject: [PATCH 052/163] feat: add ability to report domains globally

The `domains` command previously had this functionality, but is deprecated, and thus we should provide an alternative method of presenting the information.
---
 docs/configuration/domains.md      |  2 +-
 plugins/domains/internal-functions | 30 ++++++++++++++++++++++++------
 tests/unit/20_domains.bats         |  5 +++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/docs/configuration/domains.md b/docs/configuration/domains.md
index f039a51f9..1fc18556c 100644
--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -10,7 +10,7 @@ domains:disable <app>                          # Disable VHOST support
 domains:enable <app>                           # Enable VHOST support
 domains:remove <app> <domain> [<domain> ...]   # Remove domains from app
 domains:remove-global <domain> [<domain> ...]  # Remove global domain names
-domains:report [<app>] [<flag>]                # Displays a domains report for one or more apps
+domains:report [<app>|--global] [<flag>]       # Displays a domains report for one or more apps
 domains:set <app> <domain> [<domain> ...]      # Set domains for app
 domains:set-global <domain> [<domain> ...]     # Set global domain names
 ```
diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions
index f93d51429..db736e6d0 100755
--- a/plugins/domains/internal-functions
+++ b/plugins/domains/internal-functions
@@ -10,6 +10,11 @@ cmd-domains-report() {
   local INSTALLED_APPS=$(dokku_apps)
   local APP="$2" INFO_FLAG="$3"
 
+  if [[ "$APP" == "--global" ]]; then
+    cmd-domains-report-single "$APP" "$INFO_FLAG"
+    return
+  fi
+
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
     APP=""
@@ -33,16 +38,29 @@ cmd-domains-report-single() {
   if [[ "$INFO_FLAG" == "true" ]]; then
     INFO_FLAG=""
   fi
-  verify_app_name "$APP"
-  local flag_map=(
-    "--domains-app-enabled: $(fn-domains-app-enabled "$APP")"
-    "--domains-app-vhosts: $(fn-domains-app-vhosts "$APP")"
+  local flag_map=() app_flags=() global_flags=()
+
+  if [[ "$APP" != "--global" ]]; then
+    verify_app_name "$APP"
+    app_flags=(
+      "--domains-app-enabled: $(fn-domains-app-enabled "$APP")"
+      "--domains-app-vhosts: $(fn-domains-app-vhosts "$APP")"
+    )
+  fi
+
+  global_flags=(
     "--domains-global-enabled: $(fn-domains-global-enabled)"
     "--domains-global-vhosts: $(fn-domains-global-vhosts)"
   )
 
+  flag_map=("${app_flags[@]}" "${global_flags[@]}")
+
   if [[ -z "$INFO_FLAG" ]]; then
-    dokku_log_info2_quiet "$APP domains information"
+    if [[ "$APP" == "--global" ]]; then
+      dokku_log_info2_quiet "Global domains information"
+    else
+      dokku_log_info2_quiet "$APP domains information"
+    fi
     for flag in "${flag_map[@]}"; do
       key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
       dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")"
@@ -78,7 +96,7 @@ domains_help_content_func() {
     domains:enable <app>, Enable VHOST support
     domains:remove <app> <domain> [<domain> ...], Remove domains from app
     domains:remove-global <domain> [<domain> ...], Remove global domain names
-    domains:report [<app>] [<flag>], Displays a domains report for one or more apps
+    domains:report [<app>|--global] [<flag>], Displays a domains report for one or more apps
     domains:set <app> <domain> [<domain> ...], Set domains for app
     domains:set-global <domain> [<domain> ...], Set global domain names
 help_content
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 8c05f8994..2c275a275 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -191,6 +191,11 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  run /bin/bash -c "dokku domains:report --global"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku domains 2>/dev/null | egrep -qw '^global.dokku.me\$'"
   echo "output: $output"
   echo "status: $status"

From 97fe3f56b715dcb012b35da30a416b8b588d8781 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 16 Apr 2019 23:04:20 -0400
Subject: [PATCH 053/163] fix: Always allow ps:scale proc=0

With the introduciton of procfile-util, scaling a non-existent process to 0 was disabled. This brings back that functionality, allowing users to scale all processes to 0. This is especially useful when a user has accidentally scaled a non-existent process up, causing deploys to fail without any way to revert outside of manually editing files.

Closes #3428
---
 plugins/ps/functions            | 2 +-
 tests/unit/10_ps-herokuish.bats | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ps/functions b/plugins/ps/functions
index f217e6f0d..3b4270dff 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -100,7 +100,7 @@ set_scale() {
   for procscale in "${SCALE_SETTINGS[@]}"; do
     local PROC_NAME=${procscale%%=*}
     local PROC_COUNT=${procscale#*=}
-    if [[ -f "$DOKKU_PROCFILE" ]] && ! procfile-util exists --procfile "$DOKKU_PROCFILE" --process-type "$PROC_NAME" >/dev/null 2>&1; then
+    if [[ -f "$DOKKU_PROCFILE" ]] && [[ "$PROC_COUNT" != "0" ]] && ! procfile-util exists --procfile "$DOKKU_PROCFILE" --process-type "$PROC_NAME" >/dev/null 2>&1; then
       dokku_log_fail "${PROC_NAME} is not a valid process name"
     fi
     is_number "$PROC_COUNT" || dokku_log_fail "ps:scale $PROC_COUNT is not a number"
diff --git a/tests/unit/10_ps-herokuish.bats b/tests/unit/10_ps-herokuish.bats
index 8fc613441..3adc11150 100644
--- a/tests/unit/10_ps-herokuish.bats
+++ b/tests/unit/10_ps-herokuish.bats
@@ -109,11 +109,11 @@ teardown() {
     assert_success
   done
 
-  run /bin/bash -c "dokku ps:scale $TEST_APP web=0 worker=0"
+  run /bin/bash -c "dokku ps:scale $TEST_APP web=0 worker=0 invalid-process=0"
   echo "output: $output"
   echo "status: $status"
   assert_success
-  for PROC_TYPE in web worker; do
+  for PROC_TYPE in web worker invalid-process; do
     CIDS=""
     shopt -s nullglob
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do

From 322dd2246f7328a4a5d12792241300b222abc9f2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 16 Apr 2019 22:02:24 -0400
Subject: [PATCH 054/163] fix: ensure the .buildpacks file exists before
 writing to it

---
 .../src/triggers/post-extract/post-extract.go |  2 +-
 tests/unit/30_buildpacks.bats                 | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/buildpacks/src/triggers/post-extract/post-extract.go b/plugins/buildpacks/src/triggers/post-extract/post-extract.go
index 67ec7bf85..495a34855 100644
--- a/plugins/buildpacks/src/triggers/post-extract/post-extract.go
+++ b/plugins/buildpacks/src/triggers/post-extract/post-extract.go
@@ -26,7 +26,7 @@ func main() {
 	}
 
 	buildpacksPath := path.Join(tmpWorkDir, ".buildpacks")
-	file, err := os.OpenFile(buildpacksPath, os.O_RDWR|os.O_TRUNC, 0600)
+	file, err := os.OpenFile(buildpacksPath, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0600)
 	if err != nil {
 		common.LogFail(fmt.Sprintf("Error writing .buildpacks file: %s", err.Error()))
 		return
diff --git a/tests/unit/30_buildpacks.bats b/tests/unit/30_buildpacks.bats
index 687da8f41..ae955ac69 100644
--- a/tests/unit/30_buildpacks.bats
+++ b/tests/unit/30_buildpacks.bats
@@ -209,3 +209,25 @@ teardown() {
   echo "status: $status"
   assert_output_not_exists
 }
+
+@test "(buildpacks) buildpacks deploy" {
+  destroy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku buildpacks:set $TEST_APP https://github.com/heroku/heroku-buildpack-nodejs"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run deploy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}

From 662c8c2831fa098032fadb8282b400ca9d341192 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 17 Apr 2019 03:04:43 -0400
Subject: [PATCH 055/163] refactor: move log retrieval to docker-local
 scheduler

This change will allow other schedulers to implement log retrieval as necessary for the platform specified.

Closes #3487
---
 .../advanced-usage/schedulers/docker-local.md |  5 ++
 docs/development/plugin-triggers.md           | 40 ++++++++++++++-
 plugins/common/functions                      |  1 +
 plugins/logs/subcommands/default              | 40 +++------------
 plugins/scheduler-docker-local/scheduler-logs | 50 +++++++++++++++++++
 5 files changed, 102 insertions(+), 34 deletions(-)
 create mode 100755 plugins/scheduler-docker-local/scheduler-logs

diff --git a/docs/advanced-usage/schedulers/docker-local.md b/docs/advanced-usage/schedulers/docker-local.md
index 2394d2029..e1da7f384 100644
--- a/docs/advanced-usage/schedulers/docker-local.md
+++ b/docs/advanced-usage/schedulers/docker-local.md
@@ -43,12 +43,17 @@ This plugin implements various functionality through `plugn` triggers to integra
 
 - `check-deploy`
 - `core-post-deploy`
+- `post-app-clone-setup`
+- `post-create`
 - `post-delete`
 - `pre-deploy`
 - `pre-restore`
 - `scheduler-deploy`
 - `scheduler-docker-cleanup`
+- `scheduler-inspect`
 - `scheduler-logs-failed`
+- `scheduler-logs`
+- `scheduler-retire`
 - `scheduler-run`
 - `scheduler-stop`
 - `scheduler-tags-create`
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 443e0d0be..f9db28924 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1305,6 +1305,25 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 # TODO
 ```
 
+### `scheduler-logs`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when retrieving container logs
+- Invoked by: `dokku logs:failed`
+- Arguments: `$DOKKU_SCHEDULER $APP $PROCESS_TYPE $TAIL $PRETTY_PRINT $NUM`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; PROCESS_TYPE="$3"; TAIL="$4"; PRETTY_PRINT="$5"; NUM="$6"
+
+# TODO
+```
+
 ### `scheduler-logs-failed`
 
 > Warning: The scheduler plugin trigger apis are under development and may change
@@ -1319,7 +1338,26 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
+DOKKU_SCHEDULER="$1"; APP="$2";
+
+# TODO
+```
+
+### `scheduler-retire`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when containers should be force retired from the system
+- Invoked by: `dokku run`
+- Arguments: `$DOKKU_SCHEDULER`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1";
 
 # TODO
 ```
diff --git a/plugins/common/functions b/plugins/common/functions
index c5e9af265..5ab5f2f11 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -264,6 +264,7 @@ get_app_scheduler() {
   declare APP="$1"
   local DOKKU_APP_SCHEDULER DOKKU_GLOBAL_SCHEDULER DOKKU_SCHEDULER
 
+  source "$PLUGIN_AVAILABLE_PATH/config/functions"
   [[ -n "$APP" ]] && DOKKU_APP_SCHEDULER="$(config_get "$APP" DOKKU_SCHEDULER || true)"
   DOKKU_GLOBAL_SCHEDULER="$(config_get --global DOKKU_SCHEDULER || true)"
 
diff --git a/plugins/logs/subcommands/default b/plugins/logs/subcommands/default
index ee7b49c90..9901d5748 100755
--- a/plugins/logs/subcommands/default
+++ b/plugins/logs/subcommands/default
@@ -10,8 +10,6 @@ logs_default_cmd() {
   [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
   local APP="$2"
   verify_app_name "$2"
-  local APP_ROOT="$DOKKU_ROOT/$APP"
-  local COLORS=(36 33 32 35 31)
 
   ! (is_deployed "$APP") && dokku_log_fail "App $APP has not been deployed"
 
@@ -24,23 +22,23 @@ logs_default_cmd() {
   fi
   eval set -- "$TEMP"
 
-  local DOKKU_LOGS_LINE_NUMBERS="100"
+  local NUM="100"
   while true; do
     case "$1" in
       -t | --tail)
-        local DOKKU_LOGS_ARGS+="--follow "
+        local TAIL=true
         shift
         ;;
       -n | --num)
-        local DOKKU_LOGS_LINE_NUMBERS="$2"
+        local NUM="$2"
         shift 2
         ;;
       -p | --ps)
-        local DOKKU_LOGS_ONLY_PROCESS="$2"
+        local PROCESS_TYPE="$2"
         shift 2
         ;;
       -q | --quiet)
-        local DOKKU_LOGS_NO_PRETTY_PRINT="true"
+        local PRETTY_PRINT=true
         shift
         ;;
       --)
@@ -51,32 +49,8 @@ logs_default_cmd() {
     esac
   done
 
-  if [[ -n $DOKKU_LOGS_ONLY_PROCESS ]]; then
-    local CONTAINERS=("$APP_ROOT/CONTAINER.$DOKKU_LOGS_ONLY_PROCESS".*)
-  else
-    local CONTAINERS=("$APP_ROOT"/CONTAINER.*)
-  fi
-  [[ -z $(stat -t "${CONTAINERS[0]}" 2>/dev/null) ]] && exit 0
-
-  local DOKKU_LOGS_ARGS+="--tail $DOKKU_LOGS_LINE_NUMBERS"
-  ((MAX_INDEX = ${#CONTAINERS[*]} - 1)) || true
-  for i in ${!CONTAINERS[*]}; do
-    local DYNO=$(echo "${CONTAINERS[i]}" | sed -r 's/.*CONTAINER\.(.*)/\1/')
-    local CID=$(<"${CONTAINERS[i]}")
-    local COLOR=${COLORS[i % ${#COLORS[*]}]}
-    if [[ $DOKKU_LOGS_NO_PRETTY_PRINT == "true" ]]; then
-      local DOKKU_LOGS_CMD+="(docker logs $DOKKU_LOGS_ARGS $CID 2>&1)"
-    else
-      local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
-      local DOKKU_LOGS_CMD+="(docker logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
-    fi
-    if [[ $i != "$MAX_INDEX" ]]; then
-      local DOKKU_LOGS_CMD+="& "
-    else
-      local DOKKU_LOGS_CMD+="; "
-    fi
-  done
-  bash -c "($DOKKU_LOGS_CMD)"
+  DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
+  plugn trigger scheduler-logs "$DOKKU_SCHEDULER" "$APP" "$PROCESS_TYPE" "$TAIL" "$PRETTY_PRINT" "$NUM"
 }
 
 logs_default_cmd "$@"
diff --git a/plugins/scheduler-docker-local/scheduler-logs b/plugins/scheduler-docker-local/scheduler-logs
new file mode 100755
index 000000000..724a1d4f8
--- /dev/null
+++ b/plugins/scheduler-docker-local/scheduler-logs
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+scheduler-docker-local-scheduler-logs() {
+  declare desc="scheduler-docker-local scheduler-logs plugin trigger"
+  declare trigger="scheduler-docker-local scheduler-logs"
+  declare DOKKU_SCHEDULER="$1" APP="$2" PROCESS_TYPE="$3" TAIL="$4" PRETTY_PRINT="$5" NUM="$6"
+  local DOKKU_LOGS_ARGS=""
+
+  if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
+    return
+  fi
+
+  if [[ "$TAIL" == "true" ]]; then
+    DOKKU_LOGS_ARGS="--follow "
+  fi
+
+  local APP_ROOT="$DOKKU_ROOT/$APP"
+  local COLORS=(36 33 32 35 31)
+  if [[ -n "$PROCESS_TYPE" ]]; then
+    local CONTAINERS=("$APP_ROOT/CONTAINER.$PROCESS_TYPE".*)
+  else
+    local CONTAINERS=("$APP_ROOT"/CONTAINER.*)
+  fi
+  [[ -z $(stat -t "${CONTAINERS[0]}" 2>/dev/null) ]] && exit 0
+
+  local DOKKU_LOGS_ARGS+="--tail $NUM"
+  ((MAX_INDEX = ${#CONTAINERS[*]} - 1)) || true
+  for i in ${!CONTAINERS[*]}; do
+    local DYNO=$(echo "${CONTAINERS[i]}" | sed -r 's/.*CONTAINER\.(.*)/\1/')
+    local CID=$(<"${CONTAINERS[i]}")
+    local COLOR=${COLORS[i % ${#COLORS[*]}]}
+    if [[ $PRETTY_PRINT == "true" ]]; then
+      local DOKKU_LOGS_CMD+="(docker logs $DOKKU_LOGS_ARGS $CID 2>&1)"
+    else
+      local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
+      local DOKKU_LOGS_CMD+="(docker logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
+    fi
+    if [[ $i != "$MAX_INDEX" ]]; then
+      local DOKKU_LOGS_CMD+="& "
+    else
+      local DOKKU_LOGS_CMD+="; "
+    fi
+  done
+  bash -c "($DOKKU_LOGS_CMD)"
+}
+
+scheduler-docker-local-scheduler-logs "$@"

From c4c7d0d82d027d7d033648b6db54e4d0a1e6156e Mon Sep 17 00:00:00 2001
From: V Anastassiou <vanastassiou@users.noreply.github.com>
Date: Wed, 17 Apr 2019 14:03:48 -0700
Subject: [PATCH 056/163] Edits for readability and conciseness

---
 docs/development/plugin-creation.md | 77 +++++++++++++++--------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/docs/development/plugin-creation.md b/docs/development/plugin-creation.md
index 66817f2cc..27175e43d 100644
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -1,37 +1,37 @@
-# Plugin Creation
+# Plugin creation
 
-Plugins can simply be implementations of [triggers](/docs/development/plugin-triggers.md) or they may implement a command structure of their own. Dokku has no restrictions on the language in which a plugin is implemented, it only cares that the plugin implements the appropriate [commands](/docs/development/plugin-creation.md#command-api) or [triggers](/docs/development/plugin-triggers.md) API. NOTE: all files that implement the triggers or commands API must be executable.
+A plugin can be a simple implementation of [triggers](/docs/development/plugin-triggers.md) or can implement a command structure of its own. Dokku has no restrictions on the language in which a plugin is implemented; it only cares that the plugin implements the appropriate [commands](/docs/development/plugin-creation.md#command-api) or [triggers](/docs/development/plugin-triggers.md) for the API. **NOTE:** any file that implements triggers or uses the command API must be executable.
 
 If you create your own plugin:
 
-1. Take a look at the plugins shipped with Dokku and hack away!
-2. Check out the [list of triggers](/docs/development/plugin-triggers.md) your plugin can implement.
-3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](/docs/community/plugins.md) and add a link to it.
+1. Take a look at [the plugins shipped with Dokku](https://github.com/dokku/dokku/blob/master/docs/community/plugins.md) 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 following the `dokku-<name>` convention (e.g. `dokku-mariadb`)
+4. Edit [this page](/docs/community/plugins.md) and add a link to your plugin
 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.
+## Compilable plugins (Golang, Java(?), C, etc.)
+When developing a plugin, you must implement the `install` trigger such that it outputs the built executable(s) using a directory structure that implements the plugin's desired command and/or triggers the API. See the [smoke-test-plugin](https://github.com/dokku/smoke-test-plugin) for an example.
 
 
-### Command API
-There are 3 main implementation points: `commands`, `subcommands/default`, and `subcommands/<command-name>`
+## Command API
+There are 3 main integration points: `commands`, `subcommands/default`, and `subcommands/<command-name>`.
 
-#### commands
-Primarily used to supply the plugin's usage/help output. (i.e. [plugin help](https://github.com/dokku/dokku/tree/master/plugins/plugin/commands))
+### `commands`
+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/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))
+### `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
+# Sample plugin
 The below plugin is a dummy `dokku hello` plugin.
 
-hello/subcommands/default
+`hello/subcommands/default`
 
 ```shell
 #!/usr/bin/env bash
@@ -59,7 +59,7 @@ hello_main_cmd() {
 hello_main_cmd "$@"
 ```
 
-hello/subcommands/world
+`hello/subcommands/world`
 
 ```shell
 #!/usr/bin/env bash
@@ -87,7 +87,7 @@ hello_world_cmd() {
 hello_world_cmd "$@"
 ```
 
-hello/commands
+`hello/commands`
 
 ```shell
 #!/usr/bin/env bash
@@ -136,15 +136,15 @@ version = "0.1.0"
 [plugin.config]
 ```
 
-A few notes:
+# A few notes:
 
-- Don't forget to `chmod +x` your executable files.
-- You should always support `DOKKU_TRACE` as specified on the 2nd line of the plugin.
-- If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
-- A `help` command is required, though it is allowed to be empty. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.
-- Commands *should* be namespaced.
-- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
-- Be sure you want the "set -eo pipefail" option. Look at the following example :
+- Remember to `chmod +x` your executable files
+- Always support `DOKKU_TRACE` as per the 2nd line of the above example
+- If your command depends on an application, include a check for whether that application exists (see the above example)
+- You must implement a `help` command, though you may leave it empty. Also, you must use commas (`,`) in the command syntax to support output in columns
+- Commands **should** be namespaced
+- As of 0.3.3, a catch-all should be implemented that exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
+- Consider whether you want to include the `set -eo pipefail` option. Look at the following example :
 
     ```shell
     IMAGE=$(docker images | grep "user/repo" | awk '{print $3}')
@@ -153,10 +153,9 @@ A few notes:
     fi
     ```
 
-  In the case where the "user/repo" is not installed, Dokku exits just before the awk command,
-  you will never see the message printed with echo. You just want "set -e" in this case.
+  If `user/repo` doesn't exist, Dokku exits just before the `awk` command and the `dokku_log_fail` message will never go to   `STDOUT`. printed with echo. You would want to use `set -e` in this case.
 
-  Here is the documentation of the 'set -eo pipefail' option:
+  Here is the `help` entry for `set`:
   ```
   help set
     Options:
@@ -166,13 +165,19 @@ A few notes:
                        the last command to exit with a non-zero status,
                        or zero if no command exited with a non-zero status
   ```
-- As some plugins require access to set app config settings and do not want/require the default Heroku-style behavior of a restart, we have the following "internal" commands that provide this functionality :
+- In the case that your plugin needs to set application configuration settings and you want to avoid having to restart (default Heroku-style behavior) these "internal" commands provide this functionality:
 
   ```shell
   dokku config:set --no-restart node-js-app KEY1=VALUE1 [KEY2=VALUE2 ...]
   dokku config:unset --no-restart node-js-app KEY1 [KEY2 ...]
   ```
-- From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
-- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/docs/development/plugin-triggers.md) doc for examples.
-- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
-- As of 0.6.0, we advise you to *not* call the `dokku` binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions
+- If you 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
+  - You should consider all functions in that file to be publicly accessible by other plugins
+  - Any functions you want to keep private should reside in your plugin's `trigger/` or `commands/` directories
+- As of 0.4.0, Dokku allows image tagging and deployment of tagged images
+  - This means hard-coding the `$IMAGE` as `dokku/$APP` is no longer sufficient
+  - You should now use `get_running_image_tag()` and `get_app_image_name()` as sourced from `common/functions` (see the [plugin triggers](/docs/development/plugin-triggers.md) doc for examples). **Note:** This is only for plugins that are not `pre/post-build-*` plugins
+- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup
+  - This means that if you manually call `docker run`, you should include `$DOKKU_GLOBAL_RUN_ARGS` to ensure your intermediate containers are labeled correctly
+- As of 0.6.0, you should not **not** call the `dokku` binary directly from within plugins because clients using the `--app` argument are potentially broken when doing so (as well as other issues)
+  - You should instead source the `functions` file for a given plugin when attempting to call Dokku internal functions

From 9a447c16f2c83ff10d825311ce943a78ac84d17a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 17 Apr 2019 03:41:16 -0400
Subject: [PATCH 057/163] feat: add a trigger to fetch the git revision

This allows other plugins to fetch the current git revision without needing to duplicate logic from the git plugin.

Closes #3484
---
 docs/development/plugin-triggers.md | 15 +++++++++++++++
 plugins/git/git-revision            | 23 +++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100755 plugins/git/git-revision

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 443e0d0be..ad0edf619 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -381,6 +381,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 since it does not get called for commands that use `git-upload-archive` such
 as `git archive`. Instead, use the [`user-auth`](#user-auth) trigger.
 
+### `git-revision`
+
+- Description: Allows you to fetch the current git revision for a given application
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `install`
 
 - Description: Used to setup any files/configuration for a plugin.
diff --git a/plugins/git/git-revision b/plugins/git/git-revision
new file mode 100755
index 000000000..7157a6868
--- /dev/null
+++ b/plugins/git/git-revision
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-git-git-revision() {
+  declare desc="fetches the current git revision value for an application"
+  declare APP="$1"
+
+  ENV_VAR_NAME="$(fn-plugin-property-get "git" "$APP" "rev-env-var")"
+  if [[ -z "$ENV_VAR_NAME" ]] && ! fn-plugin-property-exists "git" "$APP" "rev-env-var"; then
+    ENV_VAR_NAME="GIT_REV"
+  fi
+
+  if [[ -z "$ENV_VAR_NAME" ]]; then
+    return
+  fi
+
+  config_get "$APP" "$ENV_VAR_NAME" || true
+}
+
+trigger-git-git-revision "$@"

From f39d0fc0cf14a13bd698117d6f5aafca5dd371fa Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 17 Apr 2019 17:21:45 -0400
Subject: [PATCH 058/163] docs: correct docs link to work on both site and
 github

[ci skip]
---
 docs/development/plugin-creation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/plugin-creation.md b/docs/development/plugin-creation.md
index 27175e43d..05468f134 100644
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -4,7 +4,7 @@ A plugin can be a simple implementation of [triggers](/docs/development/plugin-t
 
 If you create your own plugin:
 
-1. Take a look at [the plugins shipped with Dokku](https://github.com/dokku/dokku/blob/master/docs/community/plugins.md) and hack away!
+1. Take a look at [the plugins shipped with Dokku](/docs/community/plugins.md) and hack away!
 2. Check out the [list of triggers](/docs/development/plugin-triggers.md) your plugin can implement
 3. Upload your plugin to GitHub with a repository name following the `dokku-<name>` convention (e.g. `dokku-mariadb`)
 4. Edit [this page](/docs/community/plugins.md) and add a link to your plugin

From dbc51821934f98af8caf611b111dc2ce5837f437 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 17 Apr 2019 17:24:10 -0400
Subject: [PATCH 059/163] Release 0.15.4

# History

## 0.15.4

Install/update via the bootstrap script:

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

### Bug Fixes

- #3499: @josegonzalez Ensure the .buildpacks file exists before writing to it
- #3500: @josegonzalez Always allow ps:scale proc=0
- #3497: @josegonzalez Allow reporting domains when there are none specified

### New Features

- #3502: @josegonzalez Add a trigger to fetch the git revision
- #3501: @josegonzalez Move log retrieval to docker-local scheduler
- #3498: @josegonzalez Add ability to report domains globally
- #3496: @josegonzalez Cleanup glide plugins when running src-clean

### Documentation

- #3504: @vanastassiou Edits for readability and conciseness
- #3490: @josegonzalez Add missing link to resource management docs
---
 HISTORY.md                                 | 27 ++++++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 138 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9720c64e1..d1416f15e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,32 @@
 # History
 
+## 0.15.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh
+sudo DOKKU_TAG=v0.15.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3499: @josegonzalez Ensure the .buildpacks file exists before writing to it
+- #3500: @josegonzalez Always allow ps:scale proc=0
+- #3497: @josegonzalez Allow reporting domains when there are none specified
+
+### New Features
+
+- #3502: @josegonzalez Add a trigger to fetch the git revision
+- #3501: @josegonzalez Move log retrieval to docker-local scheduler
+- #3498: @josegonzalez Add ability to report domains globally
+- #3496: @josegonzalez Cleanup glide plugins when running src-clean
+
+### Documentation
+
+- #3504: @vanastassiou Edits for readability and conciseness
+- #3490: @josegonzalez Add missing link to resource management docs
+
 ## 0.15.3
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 16bfc84f3..d105ae1c6 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh
-sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh
+sudo DOKKU_TAG=v0.15.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.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 3ac0f071a..8feb71efb 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.3'
+VERSION = 'v0.15.4'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 6d54806a1..6a2af8261 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.3
+Version: 0.15.4
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 7361b1424..094738f3a 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.3 enabled    dokku core standard plugin
-  20_events            0.15.3 enabled    dokku core events logging plugin
-  apps                 0.15.3 enabled    dokku core apps plugin
-  build-env            0.15.3 enabled    dokku core build-env plugin
-  certs                0.15.3 enabled    dokku core certificate management plugin
-  checks               0.15.3 enabled    dokku core checks plugin
-  common               0.15.3 enabled    dokku core common plugin
-  config               0.15.3 enabled    dokku core config plugin
-  docker-options       0.15.3 enabled    dokku core docker-options plugin
-  domains              0.15.3 enabled    dokku core domains plugin
-  enter                0.15.3 enabled    dokku core enter plugin
-  git                  0.15.3 enabled    dokku core git plugin
-  logs                 0.15.3 enabled    dokku core logs plugin
-  named-containers     0.15.3 enabled    dokku core named containers plugin
-  network              0.15.3 enabled    dokku core network plugin
-  nginx-vhosts         0.15.3 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.3 enabled    dokku core plugin plugin
-  proxy                0.15.3 enabled    dokku core proxy plugin
-  ps                   0.15.3 enabled    dokku core ps plugin
-  repo                 0.15.3 enabled    dokku core repo plugin
-  shell                0.15.3 enabled    dokku core shell plugin
-  ssh-keys             0.15.3 enabled    dokku core ssh-keys plugin
-  storage              0.15.3 enabled    dokku core storage plugin
-  tags                 0.15.3 enabled    dokku core tags plugin
-  tar                  0.15.3 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.4 enabled    dokku core standard plugin
+  20_events            0.15.4 enabled    dokku core events logging plugin
+  apps                 0.15.4 enabled    dokku core apps plugin
+  build-env            0.15.4 enabled    dokku core build-env plugin
+  certs                0.15.4 enabled    dokku core certificate management plugin
+  checks               0.15.4 enabled    dokku core checks plugin
+  common               0.15.4 enabled    dokku core common plugin
+  config               0.15.4 enabled    dokku core config plugin
+  docker-options       0.15.4 enabled    dokku core docker-options plugin
+  domains              0.15.4 enabled    dokku core domains plugin
+  enter                0.15.4 enabled    dokku core enter plugin
+  git                  0.15.4 enabled    dokku core git plugin
+  logs                 0.15.4 enabled    dokku core logs plugin
+  named-containers     0.15.4 enabled    dokku core named containers plugin
+  network              0.15.4 enabled    dokku core network plugin
+  nginx-vhosts         0.15.4 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.4 enabled    dokku core plugin plugin
+  proxy                0.15.4 enabled    dokku core proxy plugin
+  ps                   0.15.4 enabled    dokku core ps plugin
+  repo                 0.15.4 enabled    dokku core repo plugin
+  shell                0.15.4 enabled    dokku core shell plugin
+  ssh-keys             0.15.4 enabled    dokku core ssh-keys plugin
+  storage              0.15.4 enabled    dokku core storage plugin
+  tags                 0.15.4 enabled    dokku core tags plugin
+  tar                  0.15.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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index de7b5fa9f..be87ba952 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index f30aa7191..686c2606f 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 4e083858a..e0a4d4601 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 28864f1dc..297a30efc 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,6 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.3"
+    "0.15.4"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index be6744b25..08b358fcf 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.3-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index e6f866974..12fcac586 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.4 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 83414a5cb..90aac5a07 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.3/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.3 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.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>
diff --git a/docs/template.html b/docs/template.html
index ddabd9605..d50c7417f 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 601257382..9933f53bc 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 9586d234a..f5112f20a 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index f22f738a2..8558e3c4d 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 85de1bf39..96246e4a0 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index c3879c0e8..87beaa681 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 835386b7b..532b8f7c2 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 8a33fdb07..534f464ab 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index bccc5b3f1..846691b2b 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index e85c4d284..f7174d283 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 4e1d05244..7c19627e8 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 619e6a60e..2e78a9b34 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index dafa061b2..05c930e60 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 30170f07c..1361efc43 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 902b521f1..d3103ea41 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index e0be9b4c7..f091bbb61 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index ece0aaae2..de9eb38b7 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 9e4e8fab7..34c63dc2f 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 42d39033a..181e1a0bb 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 9c049dd49..5dbfd8ee8 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index d473b427e..a336b8652 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 7baf994e1..d32fe3700 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 866d1a66a..591c10e11 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index bbfa1addf..66aa47f9d 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index bee5f3687..33e5975dc 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 012fc5249..e54d40c29 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 5091bad64..a1758f018 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index bd6753bfe..1f8104344 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index ff4e62c47..ab46a9206 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.3"
+version = "0.15.4"
 [plugin.config]

From 06b4585a622c776feceedfba1eb5b8fbd337639a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Stalder?= <renestalder@protonmail.com>
Date: Thu, 18 Apr 2019 18:06:52 +0200
Subject: [PATCH 060/163] docs: fix GitLab CI examples

The GitLab CI examples used `$CI_ENVIRONMENT_SLUG` for defining the environment names
of the deploy jobs. But this variable is actually the OUTPUT of setting the environment name,
thus, it tries to reference itself, but does not exist in that moment.

The correct way to set this is to use `$CI_COMMIT_REF_NAME` as based on the documentation
of GitLab's dynamic environments.
---
 docs/community/tutorials/deploying-with-gitlab-ci.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/community/tutorials/deploying-with-gitlab-ci.md b/docs/community/tutorials/deploying-with-gitlab-ci.md
index 9e3752bc0..5c7fd2e4d 100644
--- a/docs/community/tutorials/deploying-with-gitlab-ci.md
+++ b/docs/community/tutorials/deploying-with-gitlab-ci.md
@@ -65,7 +65,7 @@ review_app:
   image: ilyasemenov/gitlab-ci-git-push
   stage: deploy
   environment:
-    name: review/$CI_ENVIRONMENT_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: https://$CI_ENVIRONMENT_SLUG.dokku.me/
     on_stop: stop_review_app
   only:
@@ -88,7 +88,7 @@ stop_review_app:
   image: ilyasemenov/gitlab-ci-git-push
   stage: deploy
   environment:
-    name: review/$CI_ENVIRONMENT_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   script:

From d33ea360aca91e13ce2873a3fd405c1967a6b493 Mon Sep 17 00:00:00 2001
From: Matthieu Bacconnier <neamar@neamar.fr>
Date: Sun, 21 Apr 2019 08:13:08 +0100
Subject: [PATCH 061/163] Missing space in markdown formatting

Title was not properly displayed in github
---
 SPONSORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPONSORS.md b/SPONSORS.md
index eb1cd5b87..0b23f528f 100644
--- a/SPONSORS.md
+++ b/SPONSORS.md
@@ -1,4 +1,4 @@
-#Sponsors
+# Sponsors
 
 [Deis](http://deis.io)
 

From 0ba6e26788cf8563f165edda724041498ad08524 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 21 Apr 2019 16:09:59 -0400
Subject: [PATCH 062/163] chore: remove SPONSORS doc

This was a very incomplete list. Public sponsors for the project can be found on OpenCollective.
---
 SPONSORS.md | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 SPONSORS.md

diff --git a/SPONSORS.md b/SPONSORS.md
deleted file mode 100644
index 0b23f528f..000000000
--- a/SPONSORS.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sponsors
-
-[Deis](http://deis.io)
-
-[DigitalOcean](https://www.digitalocean.com/)
-
-[Melvin Lammerts](http://dokku.net)

From 4b63c96434bda4b66ff015090ba5752195d7f3a5 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 21 Apr 2019 16:16:39 -0400
Subject: [PATCH 063/163] feat: pre-sort config:help commands

---
 plugins/config/src/commands/commands.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/config/src/commands/commands.go b/plugins/config/src/commands/commands.go
index 04465d531..5ce6f8906 100644
--- a/plugins/config/src/commands/commands.go
+++ b/plugins/config/src/commands/commands.go
@@ -21,12 +21,12 @@ Additional commands:`
 
 	helpContent = `
     config (<app>|--global), Pretty-print an app or global environment
+    config:bundle (<app>|--global) [--merged], Bundle environment into tarfile
+    config:export (<app>|--global) [--envfile], Export a global or app environment
     config:get (<app>|--global) KEY, Display a global or app-specific config value
+    config:keys (<app>|--global) [--merged], Show keys set in environment
     config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...], Set one or more config vars
     config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...], Unset one or more config vars
-    config:export (<app>|--global) [--envfile], Export a global or app environment
-    config:keys (<app>|--global) [--merged], Show keys set in environment
-    config:bundle (<app>|--global) [--merged], Bundle environment into tarfile
 `
 )
 

From 04c9fe974eda021a6dcac6f2ccbdaf1b59ab3e53 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 21 Apr 2019 17:00:04 -0400
Subject: [PATCH 064/163] feat: add json output to config:export

This change adds json output as both key/value as well as a list of objects. The former can be used in quick scripting environments, while the latter allows higher-level languages to have a bit more structure around how environment variables are declared. Specifically, systems such as kubernetes understand the latter method, while the former can be used within Nomad job files.
---
 plugins/config/environment.go                 | 44 +++++++++++++++++--
 .../config/src/subcommands/export/export.go   |  2 +-
 plugins/config/subcommands.go                 |  4 ++
 tests/unit/20_config.bats                     | 28 +++++++++++-
 4 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/plugins/config/environment.go b/plugins/config/environment.go
index eaabf08d2..a4bb1063f 100644
--- a/plugins/config/environment.go
+++ b/plugins/config/environment.go
@@ -1,17 +1,16 @@
 package config
 
 import (
+	"archive/tar"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 
-	"archive/tar"
-
-	"os"
-
 	"github.com/dokku/dokku/plugins/common"
 	"github.com/joho/godotenv"
 	"github.com/ryanuber/columnize"
@@ -31,6 +30,10 @@ const (
 	ExportFormatShell
 	//ExportFormatPretty format: pretty-printed in columns
 	ExportFormatPretty
+	//ExportFormatJSON format: json key/value output
+	ExportFormatJSON
+	//ExportFormatJSONList format: json output as a list of objects
+	ExportFormatJSONList
 )
 
 //Env is a representation for global or app environment
@@ -168,6 +171,10 @@ func (e *Env) Export(format ExportFormat) string {
 		return e.ShellString()
 	case ExportFormatPretty:
 		return prettyPrintEnvEntries("", e.Map())
+	case ExportFormatJSON:
+		return e.JSONString()
+	case ExportFormatJSONList:
+		return e.JSONListString()
 	default:
 		common.LogFail(fmt.Sprintf("Unknown export format: %v", format))
 		return ""
@@ -190,6 +197,35 @@ func (e *Env) DockerArgsString() string {
 	return e.stringWithPrefixAndSeparator("--env=", " ")
 }
 
+//JSONString returns the contents of this Env as a key/value json object
+func (e *Env) JSONString() string {
+	data, err := json.Marshal(e.Map())
+	if err != nil {
+		return "{}"
+	}
+
+	return string(data)
+}
+
+//JSONListString returns the contents of this Env as a json list of objects containing the name and the value of the env var
+func (e *Env) JSONListString() string {
+	var list []map[string]string
+	for _, key := range e.Keys() {
+		value, _ := e.Get(key)
+		list = append(list, map[string]string{
+			"name":  key,
+			"value": value,
+		})
+	}
+
+	data, err := json.Marshal(list)
+	if err != nil {
+		return "[]"
+	}
+
+	return string(data)
+}
+
 //ShellString gets the contents of this Env in the form "KEY='value' KEY2='value'"
 // for passing the environment in the shell
 func (e *Env) ShellString() string {
diff --git a/plugins/config/src/subcommands/export/export.go b/plugins/config/src/subcommands/export/export.go
index 86fd8df8f..c83f8a6f6 100644
--- a/plugins/config/src/subcommands/export/export.go
+++ b/plugins/config/src/subcommands/export/export.go
@@ -14,7 +14,7 @@ func main() {
 	args := flag.NewFlagSet("config:export", flag.ExitOnError)
 	global := args.Bool("global", false, "--global: use the global environment")
 	merged := args.Bool("merged", false, "--merged: merge app environment and global environment")
-	format := args.String("format", "exports", "--format: [ exports | envfile | docker-args | shell ] which format to export as)")
+	format := args.String("format", "exports", "--format: [ exports | envfile | docker-args | shell | pretty | json | json-list ] which format to export as)")
 	args.Parse(os.Args[2:])
 	config.CommandExport(args.Args(), *global, *merged, *format)
 }
diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go
index eaae77b8f..c2cc061bb 100644
--- a/plugins/config/subcommands.go
+++ b/plugins/config/subcommands.go
@@ -117,6 +117,10 @@ func CommandExport(args []string, global bool, merged bool, format string) {
 		suffix = " "
 	case "pretty":
 		exportType = ExportFormatPretty
+	case "json":
+		exportType = ExportFormatJSON
+	case "json-list":
+		exportType = ExportFormatJSONList
 	default:
 		common.LogFail(fmt.Sprintf("Unknown export format: %v", format))
 	}
diff --git a/tests/unit/20_config.bats b/tests/unit/20_config.bats
index d62972353..754ed78a9 100644
--- a/tests/unit/20_config.bats
+++ b/tests/unit/20_config.bats
@@ -155,6 +155,32 @@ teardown() {
   run /bin/bash -c "dokku --app $TEST_APP config:show"
   echo "output: $output"
   echo "status: "$stat
-
   assert_output "=====> $TEST_APP env vars"$'\nBKEY:  true\naKey:  true\nbKey:  true\nzKey:  true'
 }
+
+@test "(config) config:export" {
+  run /bin/bash -c "dokku --app $TEST_APP config:set zKey=true bKey=true BKEY=true aKey=true"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku config:export --format docker-args $TEST_APP"
+  echo "output: $output"
+  echo "status: "$stat
+  assert_output "--env=BKEY='true' --env=aKey='true' --env=bKey='true' --env=zKey='true'"
+
+  run /bin/bash -c "dokku config:export --format shell $TEST_APP"
+  echo "output: $output"
+  echo "status: "$stat
+  assert_output "BKEY='true' aKey='true' bKey='true' zKey='true' "
+
+  run /bin/bash -c "dokku config:export --format json $TEST_APP"
+  echo "output: $output"
+  echo "status: "$stat
+  assert_output '{"BKEY":"true","aKey":"true","bKey":"true","zKey":"true"}'
+
+  run /bin/bash -c "dokku config:export --format json-list $TEST_APP"
+  echo "output: $output"
+  echo "status: "$stat
+  assert_output '[{"name":"BKEY","value":"true"},{"name":"aKey","value":"true"},{"name":"bKey","value":"true"},{"name":"zKey","value":"true"}]'
+}

From 0fd829ed3be3799cfe3317a5a5136987ab96ee65 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 21 Apr 2019 21:15:35 -0400
Subject: [PATCH 065/163] Release 0.15.5

# History

## 0.15.5

Install/update via the bootstrap script:

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

### New Features

- #3511: @josegonzalez Add json output to config:export

### Documentation

- #3510: @josegonzalez Remove SPONSORS doc in favor of OpenCollective
- #3509: @Neamar Missing space in markdown formatting
- #3507: @renestalder Fix GitLab CI examples
---
 HISTORY.md                                 | 19 ++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 130 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index d1416f15e..dcf5aa7e4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,24 @@
 # History
 
+## 0.15.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh
+sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh
+```
+
+### New Features
+
+- #3511: @josegonzalez Add json output to config:export
+
+### Documentation
+
+- #3510: @josegonzalez Remove SPONSORS doc in favor of OpenCollective
+- #3509: @Neamar Missing space in markdown formatting
+- #3507: @renestalder Fix GitLab CI examples
+
 ## 0.15.4
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index d105ae1c6..c69901ab7 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh
-sudo DOKKU_TAG=v0.15.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh
+sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 8feb71efb..75715215f 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.4'
+VERSION = 'v0.15.5'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 6a2af8261..c330ff244 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.4
+Version: 0.15.5
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 094738f3a..1abaec70f 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.4 enabled    dokku core standard plugin
-  20_events            0.15.4 enabled    dokku core events logging plugin
-  apps                 0.15.4 enabled    dokku core apps plugin
-  build-env            0.15.4 enabled    dokku core build-env plugin
-  certs                0.15.4 enabled    dokku core certificate management plugin
-  checks               0.15.4 enabled    dokku core checks plugin
-  common               0.15.4 enabled    dokku core common plugin
-  config               0.15.4 enabled    dokku core config plugin
-  docker-options       0.15.4 enabled    dokku core docker-options plugin
-  domains              0.15.4 enabled    dokku core domains plugin
-  enter                0.15.4 enabled    dokku core enter plugin
-  git                  0.15.4 enabled    dokku core git plugin
-  logs                 0.15.4 enabled    dokku core logs plugin
-  named-containers     0.15.4 enabled    dokku core named containers plugin
-  network              0.15.4 enabled    dokku core network plugin
-  nginx-vhosts         0.15.4 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.4 enabled    dokku core plugin plugin
-  proxy                0.15.4 enabled    dokku core proxy plugin
-  ps                   0.15.4 enabled    dokku core ps plugin
-  repo                 0.15.4 enabled    dokku core repo plugin
-  shell                0.15.4 enabled    dokku core shell plugin
-  ssh-keys             0.15.4 enabled    dokku core ssh-keys plugin
-  storage              0.15.4 enabled    dokku core storage plugin
-  tags                 0.15.4 enabled    dokku core tags plugin
-  tar                  0.15.4 enabled    dokku core tar plugin
+  00_dokku-standard    0.15.5 enabled    dokku core standard plugin
+  20_events            0.15.5 enabled    dokku core events logging plugin
+  apps                 0.15.5 enabled    dokku core apps plugin
+  build-env            0.15.5 enabled    dokku core build-env plugin
+  certs                0.15.5 enabled    dokku core certificate management plugin
+  checks               0.15.5 enabled    dokku core checks plugin
+  common               0.15.5 enabled    dokku core common plugin
+  config               0.15.5 enabled    dokku core config plugin
+  docker-options       0.15.5 enabled    dokku core docker-options plugin
+  domains              0.15.5 enabled    dokku core domains plugin
+  enter                0.15.5 enabled    dokku core enter plugin
+  git                  0.15.5 enabled    dokku core git plugin
+  logs                 0.15.5 enabled    dokku core logs plugin
+  named-containers     0.15.5 enabled    dokku core named containers plugin
+  network              0.15.5 enabled    dokku core network plugin
+  nginx-vhosts         0.15.5 enabled    dokku core nginx-vhosts plugin
+  plugin               0.15.5 enabled    dokku core plugin plugin
+  proxy                0.15.5 enabled    dokku core proxy plugin
+  ps                   0.15.5 enabled    dokku core ps plugin
+  repo                 0.15.5 enabled    dokku core repo plugin
+  shell                0.15.5 enabled    dokku core shell plugin
+  ssh-keys             0.15.5 enabled    dokku core ssh-keys plugin
+  storage              0.15.5 enabled    dokku core storage plugin
+  tags                 0.15.5 enabled    dokku core tags plugin
+  tar                  0.15.5 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index be87ba952..22799d291 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 686c2606f..b7a48167c 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index e0a4d4601..8bd0f4f3a 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 297a30efc..1acd76023 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,6 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.4"
+    "0.15.5"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 08b358fcf..b462d8df8 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.4-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.15.5-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 12fcac586..d8fafa13e 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh;
+sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 90aac5a07..c9b240b50 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.4/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.4 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index d50c7417f..1347efcf3 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.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.15.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 9933f53bc..b31d48937 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index f5112f20a..30d5e897e 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 8558e3c4d..683d7edb6 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 96246e4a0..b486b7faf 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 87beaa681..d83ad69b2 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 532b8f7c2..9a002a8b8 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 534f464ab..518ba2e0b 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 846691b2b..197eaaba4 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index f7174d283..b16855a42 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 7c19627e8..9f89d6b9c 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 2e78a9b34..cfa82e899 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 05c930e60..51a1632fa 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 1361efc43..761472dce 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index d3103ea41..558c2fd4f 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index f091bbb61..927ba5f22 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index de9eb38b7..321de5874 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 34c63dc2f..754a5585b 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 181e1a0bb..01b9865ef 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 5dbfd8ee8..97cf5bb04 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index a336b8652..b593cb1e6 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index d32fe3700..37306ca46 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 591c10e11..5747f5f7d 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 66aa47f9d..a58c16f8c 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 33e5975dc..d8537f094 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index e54d40c29..074faa92a 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index a1758f018..e8f45b96a 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 1f8104344..273121e57 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index ab46a9206..1b426959a 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.4"
+version = "0.15.5"
 [plugin.config]

From e700ad32a338161d543b07d5e6b76724cfda48bf Mon Sep 17 00:00:00 2001
From: Mayeu - Cast <Mayeu@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:56:13 +0700
Subject: [PATCH 066/163] docs: fix the deploy tutorial

Heroku's [ruby-rails-sample](https://github.com/heroku/ruby-rails-sample) does not run anymore on Dokku (or Heroku), and has been archived and replaced by [ruby-getting-started](https://github.com/heroku/ruby-getting-started).

This commit replace all the occurrences of `ruby-rails-sample` by `ruby-getting-started`.
---
 docs/deployment/application-deployment.md | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md
index 15f3bfe54..79257939f 100644
--- a/docs/deployment/application-deployment.md
+++ b/docs/deployment/application-deployment.md
@@ -10,7 +10,7 @@ Once Dokku has been configured with at least one user, applications can be deplo
 ```shell
 # from your local machine
 # SSH access to github must be enabled on this host
-git clone git@github.com:heroku/ruby-rails-sample.git
+git clone git@github.com:heroku/ruby-getting-started.git
 ```
 
 ### Create the app
@@ -19,7 +19,7 @@ Create the application on the Dokku host. You will need to SSH onto the host to
 
 ```shell
 # on the Dokku host
-dokku apps:create ruby-rails-sample
+dokku apps:create ruby-getting-started
 ```
 
 ### Create the backing services
@@ -45,7 +45,7 @@ Once the service creation is complete, set the `DATABASE_URL` environment variab
 ```shell
 # on the Dokku host
 # each official datastore offers a `link` method to link a service to any application
-dokku postgres:link railsdatabase ruby-rails-sample
+dokku postgres:link railsdatabase ruby-getting-started
 ```
 
 > You can link a single service to multiple applications or use one service per application.
@@ -55,18 +55,18 @@ dokku postgres:link railsdatabase ruby-rails-sample
 > Warning: Your application *should* respect the `PORT` environment variable or it may not respond to web requests.
 > Please see the [port management documentation](/docs/networking/port-management.md) for details.
 
-Now you can deploy the `ruby-rails-sample` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
+Now you can deploy the `ruby-getting-started` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
 
 ```shell
 # from your local machine
 # the remote username *must* be dokku or pushes will fail
-cd ruby-rails-sample
-git remote add dokku dokku@dokku.me:ruby-rails-sample
+cd ruby-getting-started
+git remote add dokku dokku@dokku.me:ruby-getting-started
 git push dokku master
 ```
 
 > Note: Some tools may not support the short-upstream syntax referenced above, and you may need to prefix
-> the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-rails-sample`
+> the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-getting-started`
 > Please see the [Git](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) documentation for more details.
 
 > Note: Your private key should be registered with ssh-agent in local development. If you get a
@@ -80,7 +80,7 @@ Compressing objects: 100% (162/162), done.
 Writing objects: 100% (231/231), 36.96 KiB | 0 bytes/s, done.
 Total 231 (delta 93), reused 147 (delta 53)
 -----> Cleaning up...
------> Building ruby-rails-sample from herokuish...
+-----> Building ruby-getting-started from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -95,7 +95,7 @@ Total 231 (delta 93), reused 147 (delta 53)
 ...
 
 =====> Application deployed:
-       http://ruby-rails-sample.dokku.me
+       http://ruby-getting-started.dokku.me
 ```
 
 When the deploy finishes, the application's URL will be shown as seen above.
@@ -109,7 +109,7 @@ If you only want to rebuild and tag a container, you can skip the deployment pha
 
 ``` shell
 # on the Dokku host
-dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
+dokku config:set ruby-getting-started DOKKU_SKIP_DEPLOY=true
 ```
 
 ### Redeploying or restarting
@@ -118,7 +118,7 @@ If you need to redeploy (or restart) your app:
 
 ```shell
 # on the Dokku host
-dokku ps:rebuild ruby-rails-sample
+dokku ps:rebuild ruby-getting-started
 ```
 
 See the [process scaling documentation](/docs/deployment/process-management.md) for more information.
@@ -143,13 +143,13 @@ The name of remote repository is used as the name of application to be deployed,
 ```shell
 # from your local machine
 # the remote username *must* be dokku or pushes will fail
-git remote add dokku dokku@dokku.me:ruby-rails-sample
+git remote add dokku dokku@dokku.me:ruby-getting-started
 git push dokku master
 ```
 
 ```
 remote: -----> Application deployed:
-remote:        http://ruby-rails-sample.dokku.me
+remote:        http://ruby-getting-started.dokku.me
 ```
 
 You can also specify fully qualified names, say `app.dokku.me`, as

From f13a66069819e77e3c101b9dd7705b3ac98f15db Mon Sep 17 00:00:00 2001
From: V Anastassiou <vanastassiou@users.noreply.github.com>
Date: Wed, 17 Apr 2019 15:52:00 -0700
Subject: [PATCH 067/163] Update application-deployment.md

Clarity and style edits
---
 docs/deployment/application-deployment.md | 48 +++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md
index 79257939f..0ccc37cef 100644
--- a/docs/deployment/application-deployment.md
+++ b/docs/deployment/application-deployment.md
@@ -1,11 +1,10 @@
 # Deploying to Dokku
 
-> Note: This document uses the hostname `dokku.me` in commands. For your server, please
-> substitute your server's hostname instead.
+> Note: This walkthrough uses the hostname `dokku.me` in commands. When deploying to your own server, you should set the `DOKKU_DOMAIN` value in the `Vagrantfile` before you initialize the Vagrant VM.
 
 ## Deploy tutorial
 
-Once Dokku has been configured with at least one user, applications can be deployed via a `git push` command. To quickly see Dokku deployment in action, you can use the Heroku Ruby on Rails example app.
+Once you have configured Dokku with at least one user, you can deploy applications using `git push`. To quickly see Dokku deployment in action, try using [the Heroku Ruby on Rails "Getting Started" app](https://github.com/heroku/ruby-getting-started).
 
 ```shell
 # from your local machine
@@ -15,7 +14,7 @@ git clone git@github.com:heroku/ruby-getting-started.git
 
 ### Create the app
 
-Create the application on the Dokku host. You will need to SSH onto the host to run this command.
+SSH into the Dokku host and create the application as follows:
 
 ```shell
 # on the Dokku host
@@ -24,7 +23,9 @@ dokku apps:create ruby-getting-started
 
 ### Create the backing services
 
-When you create a new app, Dokku by default *does not* provide any datastores such as MySQL or PostgreSQL. You will need to install plugins to handle that, but fortunately [Dokku has official plugins](/docs/community/plugins.md#official-plugins-beta) for common datastores. Our sample app requires a PostgreSQL service:
+Dokku by default **does not** provide datastores (e.g. MySQL, PostgreSQL) on a newly created app. You can add datastore support by installing plugins, and the Dokku project [provides official plugins](/docs/community/plugins.md#official-plugins-beta) for common datastores.
+
+The Getting Started app requires a PostgreSQL service, so install the plugin and create the related service as follows:
 
 ```shell
 # on the Dokku host
@@ -36,11 +37,11 @@ sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
 dokku postgres:create railsdatabase
 ```
 
-> Each service may take a few moments to create.
+Each service may take a few moments to create.
 
 ### Linking backing services to applications
 
-Once the service creation is complete, set the `DATABASE_URL` environment variable by linking the service.
+Once the services have been created, you then set the `DATABASE_URL` environment variable by linking the service, as follows:
 
 ```shell
 # on the Dokku host
@@ -48,12 +49,11 @@ Once the service creation is complete, set the `DATABASE_URL` environment variab
 dokku postgres:link railsdatabase ruby-getting-started
 ```
 
-> You can link a single service to multiple applications or use one service per application.
+Dokku supports linking a single service to multiple applications as well as linking only one service per application.
 
 ### Deploy the app
 
-> Warning: Your application *should* respect the `PORT` environment variable or it may not respond to web requests.
-> Please see the [port management documentation](/docs/networking/port-management.md) for details.
+> Warning: Your app should respect the `PORT` environment variable, otherwise it may not respond to web requests. You can find more information in the [port management documentation](/docs/networking/port-management.md).**
 
 Now you can deploy the `ruby-getting-started` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
 
@@ -69,9 +69,9 @@ git push dokku master
 > the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-getting-started`
 > Please see the [Git](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) documentation for more details.
 
-> Note: Your private key should be registered with ssh-agent in local development. If you get a
-> permission denied error when pushing you can register your private key by running
-> `ssh-add -k ~/<your private key>`.
+> Note: Your private key should be registered with `ssh-agent` in your local development environment. If you get a `permission denied` error when pushing, you can register your private key as follows: `ssh-add -k ~/<your private key>`.
+
+After running `git push dokku master`, you should have output similar to this in your terminal:
 
 ```
 Counting objects: 231, done.
@@ -98,9 +98,9 @@ Total 231 (delta 93), reused 147 (delta 53)
        http://ruby-getting-started.dokku.me
 ```
 
-When the deploy finishes, the application's URL will be shown as seen above.
+Once the deploy is complete, the application's web URL will be generated as above.
 
-Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks) or using a project's [Dockerfile](https://docs.docker.com/reference/builder/).
+Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks), as well as by using a project's [Dockerfile](https://docs.docker.com/reference/builder/).
 
 
 ### Skipping deployment
@@ -114,7 +114,7 @@ dokku config:set ruby-getting-started DOKKU_SKIP_DEPLOY=true
 
 ### Redeploying or restarting
 
-If you need to redeploy (or restart) your app: 
+If you need to redeploy or restart your app: 
 
 ```shell
 # on the Dokku host
@@ -123,9 +123,9 @@ dokku ps:rebuild ruby-getting-started
 
 See the [process scaling documentation](/docs/deployment/process-management.md) for more information.
 
-### Deploying with private git submodules
+### Deploying with private Git submodules
 
-Dokku uses Git locally (i.e. not a Docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private Git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add `github.com` (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.
+Dokku uses Git locally (i.e. not a Docker image) to build its own copy of your app repo, including submodules, as the `dokku` user. This means that in order to deploy private Git submodules, you need to put your deploy key in `/home/dokku/.ssh/` and potentially add `github.com` (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. You can use the following test to confirm your setup is correct:
 
 ```shell
 # on the Dokku host
@@ -134,11 +134,11 @@ ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 ssh -T git@github.com
 ```
 
-Note that if the buildpack or Dockerfile build process require SSH key access for other reasons, the above may not always apply.
+> Warning: if the buildpack or Dockerfile build process require SSH key access for other reasons, the above may not always apply.
 
 ## Deploying to subdomains
 
-The name of remote repository is used as the name of application to be deployed, as for example above:
+If you do not enter a fully qualified domain name when pushing your app, Dokku deploys the app to `<remotename>.yourdomain.tld` as follows:
 
 ```shell
 # from your local machine
@@ -152,7 +152,7 @@ remote: -----> Application deployed:
 remote:        http://ruby-getting-started.dokku.me
 ```
 
-You can also specify fully qualified names, say `app.dokku.me`, as
+You can also specify the fully qualified name as follows:
 
 ```shell
 # from your local machine
@@ -166,7 +166,7 @@ remote: -----> Application deployed:
 remote:        http://app.dokku.me
 ```
 
-This is in particular useful, then you want to deploy to root domain, as
+This is useful when you want to deploy to the root domain:
 
 ```shell
 # from your local machine
@@ -182,9 +182,9 @@ git push dokku master
 
 ## Dokku/Docker container management compatibility
 
-Dokku is, at its core, a Docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the Docker daemon. One thing to note as in [issue #1220](https://github.com/dokku/dokku/issues/1220), Dokku executes a cleanup function prior to every deployment.
+Dokku is, at its core, a Docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the Docker daemon.
 
-As of 0.5.x, this function removes all containers with the label `dokku` where the status is either `dead` or `exited`, as well as all `dangling` images. Previous versions would remove `dead` or `exited` containers, regardless of their label.
+Prior to every deployment, Dokku will execute a cleanup function. As of 0.5.x, the cleanup removes all containers with the `dokku` label where the status is either `dead` or `exited` (previous versions would remove _all_ `dead` or `exited` containers). The cleanup function also removes all images with `dangling` status.
 
 ## Adding deploy users
 

From cb16cae09b20ccfbdc430a4cf627e9c956beeedd Mon Sep 17 00:00:00 2001
From: Alessio <alessio.peternelli@gmail.com>
Date: Mon, 22 Apr 2019 22:08:28 +0100
Subject: [PATCH 068/163] fix nginx template with Connection header to
 http_connection

---
 plugins/nginx-vhosts/templates/nginx.conf.sigil | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil
index 360ba4a6a..59e902ba9 100644
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -26,7 +26,7 @@ server {
     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 Connection $http_connection;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Forwarded-For $remote_addr;

From f6cc77bc3a19f7050df83fc232ba4a369713e7cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Stalder?= <renestalder@protonmail.com>
Date: Tue, 23 Apr 2019 10:17:50 +0200
Subject: [PATCH 069/163] docs: add GitLab GIT_STRATEGY for stop_preview_app

Use `GIT_STRATEGY: none` in `stop_review_app` to make job work after successful
merges and when the branch was deleted.

Without this, the application is not stopped when the branch is deleted on merge as the runner pulls the git repository by default, but cannot find the tree in this moment.

[skip ci]
---
 docs/community/tutorials/deploying-with-gitlab-ci.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/community/tutorials/deploying-with-gitlab-ci.md b/docs/community/tutorials/deploying-with-gitlab-ci.md
index 5c7fd2e4d..e35119752 100644
--- a/docs/community/tutorials/deploying-with-gitlab-ci.md
+++ b/docs/community/tutorials/deploying-with-gitlab-ci.md
@@ -87,6 +87,8 @@ The above only runs for non-master branches, and will _also_ trigger an `on_stop
 stop_review_app:
   image: ilyasemenov/gitlab-ci-git-push
   stage: deploy
+  variables:
+    GIT_STRATEGY: none
   environment:
     name: review/$CI_COMMIT_REF_NAME
     action: stop

From 252092c73adf2ca8649598c8788d5ec12905be69 Mon Sep 17 00:00:00 2001
From: Mayeu <m@mayeu.me>
Date: Tue, 23 Apr 2019 15:23:35 +0700
Subject: [PATCH 070/163] feat: support the file:// scheme to install plugin

---
 plugins/plugin/subcommands/install |  2 +-
 tests/unit/40_plugin.bats          | 49 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/plugins/plugin/subcommands/install b/plugins/plugin/subcommands/install
index c9cf82926..6516a05f2 100755
--- a/plugins/plugin/subcommands/install
+++ b/plugins/plugin/subcommands/install
@@ -13,7 +13,7 @@ plugin_install_cmd() {
       [[ "$#" -gt 2 ]] && dokku_log_info1_quiet "Cannot install additional core plugins, running core plugin install trigger"
       PLUGIN_PATH="$PLUGIN_CORE_PATH" plugn trigger install
       ;;
-    https:* | git* | ssh:* | *.tar.gz | *.tgz)
+    https:* | git* | ssh:* | file:* | *.tar.gz | *.tgz)
       shift
       download_and_enable_plugin "$@"
       plugn trigger install
diff --git a/tests/unit/40_plugin.bats b/tests/unit/40_plugin.bats
index 7f2e0e0e5..a2f94b51a 100644
--- a/tests/unit/40_plugin.bats
+++ b/tests/unit/40_plugin.bats
@@ -3,13 +3,20 @@
 load test_helper
 TEST_PLUGIN_NAME=smoke-test-plugin
 TEST_PLUGIN_GIT_REPO=https://github.com/dokku/${TEST_PLUGIN_NAME}.git
+TEST_PLUGIN_LOCAL_REPO="$(mktemp -d)/$TEST_PLUGIN_NAME"
+
+clone_test_plugin() {
+  git clone "$TEST_PLUGIN_GIT_REPO" "$TEST_PLUGIN_LOCAL_REPO"
+}
 
 setup() {
   global_setup
+  clone_test_plugin
 }
 
 remove_test_plugin() {
   rm -rf $PLUGIN_ENABLED_PATH/$TEST_PLUGIN_NAME $PLUGIN_AVAILABLE_PATH/$TEST_PLUGIN_NAME
+  rm -rf $TEST_PLUGIN_LOCAL_REPO
 }
 
 teardown() {
@@ -59,6 +66,48 @@ teardown() {
   assert_failure
 }
 
+@test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall (with file://)" {
+  run /bin/bash -c "dokku plugin:install file://$TEST_PLUGIN_LOCAL_REPO --name $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku plugin:update $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "sudo -E -u nobody dokku plugin:uninstall $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku plugin:disable $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku plugin:uninstall $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku plugin | grep $TEST_PLUGIN_NAME"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+}
+
 @test "(plugin) plugin:install plugin:update (with tag)" {
   run /bin/bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --committish v0.2.0 --name $TEST_PLUGIN_NAME"
   echo "output: $output"

From d356cef183c88eea12bb5f53c6dc9a2d59d29806 Mon Sep 17 00:00:00 2001
From: Marc Diethelm <mail@marcd.ch>
Date: Sat, 27 Apr 2019 14:17:59 +0200
Subject: [PATCH 071/163] Adds an example how to specify a Dockerfile for
 deployment

---
 docs/deployment/methods/dockerfiles.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/deployment/methods/dockerfiles.md b/docs/deployment/methods/dockerfiles.md
index 4a8458fa9..4433c6cb5 100644
--- a/docs/deployment/methods/dockerfiles.md
+++ b/docs/deployment/methods/dockerfiles.md
@@ -26,6 +26,7 @@ For security reasons - and as per [Docker recommendations](https://github.com/do
 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 '--file Dockerfile.dokku' # e.g. to use alternate Dockerfile
 dokku docker-options:add node-js-app build '--build-arg NODE_ENV=production'
 ```
 

From dad5db4e9b10115cec6d68b4bb651e69225c16f8 Mon Sep 17 00:00:00 2001
From: Alex Quick <alex@alexquick.com>
Date: Sun, 17 Mar 2019 19:14:14 -0400
Subject: [PATCH 072/163] [feature] add --env to dokku run

`dokku run [ --env KEY=VALUE | -e KEY=VALUE ] app command`

__note__ this changes the scheduler-run trigger to expect the following arguments:
scheduler_name, app_name, env_count, env_0, ..., env_n, app_arg_0, ..., app_arg_n

resolves: dokku/dokku#3291
---
 docs/deployment/one-off-processes.md         |  5 ++-
 plugins/00_dokku-standard/commands           |  2 +-
 plugins/00_dokku-standard/subcommands/run    | 32 ++++++++++++++++++--
 plugins/scheduler-docker-local/scheduler-run | 29 ++++++++++--------
 tests/unit/40_core_2.bats                    | 12 ++++++++
 5 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/docs/deployment/one-off-processes.md b/docs/deployment/one-off-processes.md
index 719adbb46..79dfb5a16 100644
--- a/docs/deployment/one-off-processes.md
+++ b/docs/deployment/one-off-processes.md
@@ -5,7 +5,7 @@ Sometimes you need to either inspect running containers or run a one-off command
 ## Run a command in an app environment
 
 ```
-run <app> <cmd>                                # Run a command in a new container using the current application image
+run [ --env KEY=VALUE | -e KEY=VALUE ] <app> <cmd>  # Run a command in a new container using the current application image
 ```
 
 The `run` command can be used to run a one-off process for a specific command. This will start a new container and run the desired command within that container. Note that this container will be stay around even after command completes. The container will be the same container as was used to start the currently deployed application.
@@ -13,6 +13,9 @@ The `run` command can be used to run a one-off process for a specific command. T
 ```shell
 # runs `ls -lah` in the `/app` directory of the application `node-js-app`
 dokku run node-js-app ls -lah
+
+# optionally, run can be passed custom environment variables
+dokku run --env "NODE_ENV=development" --env "PATH=/custom/path" node-js-app npm run mytask
 ```
 
 The `run` command can also be used to run a command defined in your Procfile:
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 718ff096b..551d5a405 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -9,7 +9,7 @@ case "$1" in
     help_content_func() {
       declare desc="return standard plugin help content"
       cat <<help_content
-    run <app> <cmd>, Run a command in a new container using the current application image
+    run [--env KEY=VALUE] <app> <cmd>, Run a command in a new container using the current application image
     trace [on/off], Enable dokku tracing
     url <app>, Show the first URL for an application (compatibility)
     urls <app>, Show all URLs for an application
diff --git a/plugins/00_dokku-standard/subcommands/run b/plugins/00_dokku-standard/subcommands/run
index a8fc3b2fc..22b87748c 100755
--- a/plugins/00_dokku-standard/subcommands/run
+++ b/plugins/00_dokku-standard/subcommands/run
@@ -6,12 +6,38 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 dokku_run_cmd() {
   declare desc="runs command in container based on app image"
-  declare cmd="run" APP="$2"
+  declare cmd="run" APP=""
+  shift
+
+  declare -a RUN_ENV
+  RUN_ENV=()
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -e=* | --env=*)
+        local arg=$(printf "%s" "$1" | sed -E 's/(^-e=)|(^--env=)//g')
+        RUN_ENV+=("$arg")
+        shift
+        ;;
+      -e | --env)
+        if [[ ! $2 ]]; then
+          dokku_log_warn "expected $1 to have an argument"
+          break
+        fi
+        RUN_ENV+=("$2")
+        shift 2
+        ;;
+      *)
+        APP="$1"
+        shift
+        break
+        ;;
+    esac
+  done
+
   verify_app_name "$APP"
-  shift 2
 
   local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
-  plugn trigger scheduler-run "$DOKKU_SCHEDULER" "$APP" "$@"
+  plugn trigger scheduler-run "$DOKKU_SCHEDULER" "$APP" "${#RUN_ENV[@]}" "${RUN_ENV[@]}" "$@"
 }
 
 dokku_run_cmd "$@"
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index 0b3a228ff..3b6e75121 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -8,8 +8,11 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 scheduler-docker-local-scheduler-run() {
   declare desc="runs command in container based on app image"
   declare trigger="scheduler-docker-local scheduler-run"
-  declare DOKKU_SCHEDULER="$1" APP="$2"
-  shift 2
+  declare DOKKU_SCHEDULER="$1" APP="$2" ENV_COUNT="$3"
+  shift 3
+
+  declare RUN_ENV=("${@:1:ENV_COUNT}")
+  shift "$ENV_COUNT"
 
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
@@ -25,23 +28,25 @@ scheduler-docker-local-scheduler-run() {
   fi
 
   local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
-  [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
+  [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
 
   local IMAGE_SOURCE_TYPE="dockerfile"
   is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
   DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
-
-  declare -a ARG_ARRAY
-  eval "ARG_ARRAY=($DOCKER_ARGS)"
-
-  local DOKKU_RUN_OPTS=" -e DYNO=run.$RANDOM"
+  DOCKER_ARGS+=" -e DYNO=run.$RANDOM"
   if [[ "$DOKKU_RM_CONTAINER" ]]; then
-    DOKKU_RUN_OPTS+=" --rm"
+    DOCKER_ARGS+=" --rm"
   elif [[ "$DOKKU_DETACH_CONTAINER" ]]; then
-    DOKKU_RUN_OPTS+=" --detach"
+    DOCKER_ARGS+=" --detach"
   fi
+  has_tty && DOCKER_ARGS+=" -i -t"
+  # the output of docker-args-run is possibly quoted/escaped so eval to normalize
+  declare -a DOCKER_ARGS_ARRAY
+  eval "DOCKER_ARGS_ARRAY=($DOCKER_ARGS)"
+  for env_pair in "${RUN_ENV[@]}"; do
+    DOCKER_ARGS_ARRAY+=("--env=$env_pair")
+  done
 
-  has_tty && DOKKU_RUN_OPTS+=" -i -t"
   [[ "$IMAGE_SOURCE_TYPE" == "herokuish" ]] && local EXEC_CMD="/exec"
 
   DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
@@ -56,7 +61,7 @@ scheduler-docker-local-scheduler-run() {
   fi
 
   # shellcheck disable=SC2086
-  docker run $DOKKU_GLOBAL_RUN_ARGS $DOKKU_RUN_OPTS "${ARG_ARRAY[@]}" $IMAGE $EXEC_CMD "$@"
+  docker run $DOKKU_GLOBAL_RUN_ARGS "${DOCKER_ARGS_ARRAY[@]}" $IMAGE $EXEC_CMD "$@"
 }
 
 scheduler-docker-local-scheduler-run "$@"
diff --git a/tests/unit/40_core_2.bats b/tests/unit/40_core_2.bats
index 22ec06ca2..ffd74ff6b 100644
--- a/tests/unit/40_core_2.bats
+++ b/tests/unit/40_core_2.bats
@@ -39,6 +39,18 @@ assert_url() {
   assert_success
 }
 
+@test "(core) run (with --env / -e)" {
+  deploy_app
+  run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | egrep '^TEST=testvalue'"
+  echo "output: $output"
+  echo "status: $status"
+
+  run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | egrep '^TEST2=testvalue2'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
 @test "(core) unknown command" {
   run /bin/bash -c "dokku fakecommand"
   echo "output: $output"

From 9fc26aeb417751d84402aba3eb5bd6119cd3f0da Mon Sep 17 00:00:00 2001
From: Jens Fischer <artofrawr@gmail.com>
Date: Thu, 2 May 2019 22:09:27 -0400
Subject: [PATCH 073/163] add multi dockerfile plugin to plugins.md

---
 docs/community/plugins.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/community/plugins.md b/docs/community/plugins.md
index 0c63f5896..a5f317f9e 100644
--- a/docs/community/plugins.md
+++ b/docs/community/plugins.md
@@ -57,6 +57,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 [Aluxian]: https://github.com/Aluxian
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
+[artofrawr]: https://github.com/artofrawr
 [basgys]: https://github.com/basgys
 [Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [blag]: https://github.com/blag
@@ -229,6 +230,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+                |
 | [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
 | [Monorepo](https://github.com/iamale/dokku-monorepo)                                              | [iamale][]            | 0.4.0+                |
+| [Multi Dockerfile](https://github.com/artofrawr/dokku-multi-dockerfile)                           | [artofrawr][]         | 0.4.0+                |
 | [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            | 0.3.x                 |
 | [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         | 0.3.x                 |
 | [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+                |

From 6869fda75be2194b350c94457fe633a7bb89f659 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 6 May 2019 10:51:20 -0400
Subject: [PATCH 074/163] fix: use DOKKU_IMAGE for report command

---
 dokku                                        | 2 +-
 plugins/00_dokku-standard/subcommands/report | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dokku b/dokku
index 3ec818777..6d90d7d72 100755
--- a/dokku
+++ b/dokku
@@ -36,7 +36,7 @@ DOKKU_DISTRO=$(
   echo "$ID"
 )
 
-export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
+export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest"}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
 
 export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report
index a8cad044b..0fb8923ab 100755
--- a/plugins/00_dokku-standard/subcommands/report
+++ b/plugins/00_dokku-standard/subcommands/report
@@ -17,7 +17,7 @@ dokku_report_cmd() {
   docker -D info | sed "s/^/       /"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
-  docker run --rm gliderlabs/herokuish:latest herokuish version | sed "s/^/       /"
+  docker run --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/       /"
   dokku_log_info1 "dokku version: $(dokku version)"
   dokku_log_info1 "dokku plugins: "
   dokku plugin:list | sed "s/^/       /"

From 0275c65b8a86f52da0d64e392e48d2071ce0f4fd Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 6 May 2019 11:18:56 -0400
Subject: [PATCH 075/163] feat: add support for quiet ps:scale output

The previous output required too much parsing to be used in an automated fashion. This change makes that a bit easier, without sacrificing usability.

Note that the output is quite a bit different from heroku. This is purposeful as we do not have the concept of dynos.

Closes #3520
---
 plugins/ps/functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ps/functions b/plugins/ps/functions
index 3b4270dff..2a8f0cde4 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -185,13 +185,13 @@ ps_scale() {
   [[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG"
   if [[ -z "$@" ]]; then
     dokku_log_info1_quiet "Scaling for $APP"
-    dokku_col_log_info1_quiet "proctype" "qty"
-    dokku_col_log_info1_quiet "--------" "---"
+    dokku_col_log_msg_quiet "proctype" "qty"
+    dokku_col_log_msg_quiet "--------" "---"
     while read -r line || [[ -n "$line" ]]; do
       [[ -z "$line" ]] && continue
       local PROC_NAME=${line%%=*}
       local PROC_COUNT=${line#*=}
-      dokku_col_log_info1 "$PROC_NAME" "$PROC_COUNT"
+      dokku_col_log_msg "${PROC_NAME}:" "$PROC_COUNT"
     done <"$DOKKU_SCALE_FILE"
   else
     set_scale "$APP" "$@"

From 2f83b29f1a60608a970a63dd1db46c09036b999e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 7 May 2019 12:02:19 -0400
Subject: [PATCH 076/163] Release 0.16.0

# History

## 0.16.0

Install/update via the bootstrap script:

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

### Bug Fixes

- #3527: @josegonzalez Use DOKKU_IMAGE for report command

### New Features

- #3528: @josegonzalez feat: add support for quiet ps:scale output
- #3516: @ape-box fix nginx template with Connection header to http_connection
- #3513: @Mayeu Support installing plugins via file:// scheme

### Documentation

- #3525: @artofrawr add multi dockerfile plugin to plugins.md
- #3518: @renestalder Add GitLab GIT_STRATEGY for stop_preview_app
- #3506: @vanastassiou Clarify application deployment documentation
- #3512: @Mayeu Update example app in deploy tutorial
---
 HISTORY.md                                 | 26 +++++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  3 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 138 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index dcf5aa7e4..2f6e973c8 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,31 @@
 # History
 
+## 0.16.0
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh
+sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3527: @josegonzalez Use DOKKU_IMAGE for report command
+
+### New Features
+
+- #3528: @josegonzalez feat: add support for quiet ps:scale output
+- #3516: @ape-box fix nginx template with Connection header to http_connection
+- #3513: @Mayeu Support installing plugins via file:// scheme
+
+### Documentation
+
+- #3525: @artofrawr add multi dockerfile plugin to plugins.md
+- #3518: @renestalder Add GitLab GIT_STRATEGY for stop_preview_app
+- #3506: @vanastassiou Clarify application deployment documentation
+- #3512: @Mayeu Update example app in deploy tutorial
+
 ## 0.15.5
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index c69901ab7..c12c02380 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh
-sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh
+sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 75715215f..b83ecd8e2 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.15.5'
+VERSION = 'v0.16.0'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index c330ff244..18c981225 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.15.5
+Version: 0.16.0
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 1abaec70f..0ae0f5590 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.15.5 enabled    dokku core standard plugin
-  20_events            0.15.5 enabled    dokku core events logging plugin
-  apps                 0.15.5 enabled    dokku core apps plugin
-  build-env            0.15.5 enabled    dokku core build-env plugin
-  certs                0.15.5 enabled    dokku core certificate management plugin
-  checks               0.15.5 enabled    dokku core checks plugin
-  common               0.15.5 enabled    dokku core common plugin
-  config               0.15.5 enabled    dokku core config plugin
-  docker-options       0.15.5 enabled    dokku core docker-options plugin
-  domains              0.15.5 enabled    dokku core domains plugin
-  enter                0.15.5 enabled    dokku core enter plugin
-  git                  0.15.5 enabled    dokku core git plugin
-  logs                 0.15.5 enabled    dokku core logs plugin
-  named-containers     0.15.5 enabled    dokku core named containers plugin
-  network              0.15.5 enabled    dokku core network plugin
-  nginx-vhosts         0.15.5 enabled    dokku core nginx-vhosts plugin
-  plugin               0.15.5 enabled    dokku core plugin plugin
-  proxy                0.15.5 enabled    dokku core proxy plugin
-  ps                   0.15.5 enabled    dokku core ps plugin
-  repo                 0.15.5 enabled    dokku core repo plugin
-  shell                0.15.5 enabled    dokku core shell plugin
-  ssh-keys             0.15.5 enabled    dokku core ssh-keys plugin
-  storage              0.15.5 enabled    dokku core storage plugin
-  tags                 0.15.5 enabled    dokku core tags plugin
-  tar                  0.15.5 enabled    dokku core tar plugin
+  00_dokku-standard    0.16.0 enabled    dokku core standard plugin
+  20_events            0.16.0 enabled    dokku core events logging plugin
+  apps                 0.16.0 enabled    dokku core apps plugin
+  build-env            0.16.0 enabled    dokku core build-env plugin
+  certs                0.16.0 enabled    dokku core certificate management plugin
+  checks               0.16.0 enabled    dokku core checks plugin
+  common               0.16.0 enabled    dokku core common plugin
+  config               0.16.0 enabled    dokku core config plugin
+  docker-options       0.16.0 enabled    dokku core docker-options plugin
+  domains              0.16.0 enabled    dokku core domains plugin
+  enter                0.16.0 enabled    dokku core enter plugin
+  git                  0.16.0 enabled    dokku core git plugin
+  logs                 0.16.0 enabled    dokku core logs plugin
+  named-containers     0.16.0 enabled    dokku core named containers plugin
+  network              0.16.0 enabled    dokku core network plugin
+  nginx-vhosts         0.16.0 enabled    dokku core nginx-vhosts plugin
+  plugin               0.16.0 enabled    dokku core plugin plugin
+  proxy                0.16.0 enabled    dokku core proxy plugin
+  ps                   0.16.0 enabled    dokku core ps plugin
+  repo                 0.16.0 enabled    dokku core repo plugin
+  shell                0.16.0 enabled    dokku core shell plugin
+  ssh-keys             0.16.0 enabled    dokku core ssh-keys plugin
+  storage              0.16.0 enabled    dokku core storage plugin
+  tags                 0.16.0 enabled    dokku core tags plugin
+  tar                  0.16.0 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 22799d291..92080afec 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index b7a48167c..76d1ee7e3 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 8bd0f4f3a..af3e1715a 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 1acd76023..f4e8f2608 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -12,6 +12,7 @@
     "0.12.13",
     "0.13.4",
     "0.14.6",
-    "0.15.5"
+    "0.15.5",
+    "0.16.0"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index b462d8df8..6296987e3 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.15.5-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.16.0-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index d8fafa13e..5197bf0fa 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh;
-sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh;
+sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index c9b240b50..b72e7c738 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.15.5/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 1347efcf3..9716ff834 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index b31d48937..00b36788e 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 30d5e897e..6392bce2e 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 683d7edb6..a24bfcd75 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index b486b7faf..8c2e4171b 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index d83ad69b2..8b8296f55 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 9a002a8b8..e56dd8de2 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 518ba2e0b..ddfb7aafd 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 197eaaba4..dbcb99fd3 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index b16855a42..1b3045338 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 9f89d6b9c..bca165fc1 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index cfa82e899..bfc1ae1cc 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 51a1632fa..544072b93 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 761472dce..4eda6146f 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 558c2fd4f..7a6f2633c 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 927ba5f22..829475525 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 321de5874..1de8eabfa 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 754a5585b..bc96ced44 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 01b9865ef..ffc0d6849 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 97cf5bb04..b66a3db3c 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index b593cb1e6..9315415a7 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 37306ca46..5f67f115b 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 5747f5f7d..3e2c075b7 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index a58c16f8c..bc645a027 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index d8537f094..8e06158f6 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 074faa92a..e09eb2730 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index e8f45b96a..a6e0f8c39 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 273121e57..ce2ce52b5 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 1b426959a..553283f13 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.15.5"
+version = "0.16.0"
 [plugin.config]

From 7be4a3ee48727136e00f1955756db9413a834581 Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Wed, 8 May 2019 23:04:00 -0400
Subject: [PATCH 077/163] Updated info about supported Ubuntu versions

---
 docs/getting-started/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 5197bf0fa..8cd6cab89 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -6,7 +6,7 @@ Dokku is an extensible, open source Platform as a Service that runs on a single
 
 To start using Dokku, you'll need a system that meets the following minimum requirements:
 
-- A fresh installation of [Ubuntu 16.04 x64](https://www.ubuntu.com/download), [Ubuntu 14.04 x64](https://www.ubuntu.com/download), [Debian 8.2 x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set <sup>[1]</sup>
+- A fresh installation of [Ubuntu x64 - Any currently supported release](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 1 GB of system memory <sup>[2]</sup>
 
 You can *optionally* have a domain name pointed at the host's IP, though this is not necessary.

From 5373cf29895ca34341f872ae253f9fcce03d244f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 10 May 2019 17:02:26 -0400
Subject: [PATCH 078/163] refactor: allow the scheduler to decide if an app is
 deployed

Without moving this to the scheduler, all applications are assumed to not be deployed unless the scheduler is set to docker-local.

Closes #3531
---
 docs/development/plugin-triggers.md           | 18 +++++++++++++++
 plugins/common/functions                      | 12 ++++------
 .../scheduler-is-deployed                     | 23 +++++++++++++++++++
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100755 plugins/scheduler-docker-local/scheduler-is-deployed

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 253e2921f..7142cd3b5 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1320,6 +1320,24 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 # TODO
 ```
 
+### `scheduler-is-deployed`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to check if an app has been deployed
+- Invoked by: `dokku ps:rebuild`
+- Arguments: `$DOKKU_SCHEDULER $APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2";
+
+# TODO
+```
 ### `scheduler-logs`
 
 > Warning: The scheduler plugin trigger apis are under development and may change
diff --git a/plugins/common/functions b/plugins/common/functions
index 5ab5f2f11..a5e7eaf19 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -450,14 +450,10 @@ get_app_running_container_types() {
 is_deployed() {
   declare desc="return 0 if given app has a running container"
   local APP="$1"
-  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]] || [[ $(
-    ls "$DOKKU_ROOT/$APP"/CONTAINER.* &>/dev/null
-    echo $?
-  ) -eq 0 ]]; then
-    return 0
-  else
-    return 1
-  fi
+  source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
+  plugn trigger scheduler-is-deployed "$DOKKU_SCHEDULER" "$APP"
 }
 
 is_container_running() {
diff --git a/plugins/scheduler-docker-local/scheduler-is-deployed b/plugins/scheduler-docker-local/scheduler-is-deployed
new file mode 100755
index 000000000..c86f34f98
--- /dev/null
+++ b/plugins/scheduler-docker-local/scheduler-is-deployed
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+scheduler-docker-local-scheduler-is-deployed() {
+  declare desc="checks if an app is deployed"
+  declare DOKKU_SCHEDULER="$1" APP="$2"
+
+  if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
+    return
+  fi
+
+  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]] || [[ $(
+    ls "$DOKKU_ROOT/$APP"/CONTAINER.* &>/dev/null
+    echo $?
+  ) -eq 0 ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+scheduler-docker-local-scheduler-is-deployed "$@"

From b9152ee77e1bda330730b9d5b409d21981fd6296 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 10 May 2019 18:34:41 -0400
Subject: [PATCH 079/163] Release 0.16.1

# History

## 0.16.1

Install/update via the bootstrap script:

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

### New Features

- #3532: @josegonzalez refactor: allow the scheduler to decide if an app is deployed

### Documentation

- #3530: @jhstatewide Updated info about supported Ubuntu versions
---
 HISTORY.md                                 | 17 ++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 128 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 2f6e973c8..66b0d5e1c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,22 @@
 # History
 
+## 0.16.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh
+sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh
+```
+
+### New Features
+
+- #3532: @josegonzalez refactor: allow the scheduler to decide if an app is deployed
+
+### Documentation
+
+- #3530: @jhstatewide Updated info about supported Ubuntu versions
+
 ## 0.16.0
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index c12c02380..eb5a8469e 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh
-sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh
+sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index b83ecd8e2..a3f8509cc 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.16.0'
+VERSION = 'v0.16.1'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 18c981225..7b9a706ef 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.16.0
+Version: 0.16.1
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 0ae0f5590..fd38542a9 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.16.0 enabled    dokku core standard plugin
-  20_events            0.16.0 enabled    dokku core events logging plugin
-  apps                 0.16.0 enabled    dokku core apps plugin
-  build-env            0.16.0 enabled    dokku core build-env plugin
-  certs                0.16.0 enabled    dokku core certificate management plugin
-  checks               0.16.0 enabled    dokku core checks plugin
-  common               0.16.0 enabled    dokku core common plugin
-  config               0.16.0 enabled    dokku core config plugin
-  docker-options       0.16.0 enabled    dokku core docker-options plugin
-  domains              0.16.0 enabled    dokku core domains plugin
-  enter                0.16.0 enabled    dokku core enter plugin
-  git                  0.16.0 enabled    dokku core git plugin
-  logs                 0.16.0 enabled    dokku core logs plugin
-  named-containers     0.16.0 enabled    dokku core named containers plugin
-  network              0.16.0 enabled    dokku core network plugin
-  nginx-vhosts         0.16.0 enabled    dokku core nginx-vhosts plugin
-  plugin               0.16.0 enabled    dokku core plugin plugin
-  proxy                0.16.0 enabled    dokku core proxy plugin
-  ps                   0.16.0 enabled    dokku core ps plugin
-  repo                 0.16.0 enabled    dokku core repo plugin
-  shell                0.16.0 enabled    dokku core shell plugin
-  ssh-keys             0.16.0 enabled    dokku core ssh-keys plugin
-  storage              0.16.0 enabled    dokku core storage plugin
-  tags                 0.16.0 enabled    dokku core tags plugin
-  tar                  0.16.0 enabled    dokku core tar plugin
+  00_dokku-standard    0.16.1 enabled    dokku core standard plugin
+  20_events            0.16.1 enabled    dokku core events logging plugin
+  apps                 0.16.1 enabled    dokku core apps plugin
+  build-env            0.16.1 enabled    dokku core build-env plugin
+  certs                0.16.1 enabled    dokku core certificate management plugin
+  checks               0.16.1 enabled    dokku core checks plugin
+  common               0.16.1 enabled    dokku core common plugin
+  config               0.16.1 enabled    dokku core config plugin
+  docker-options       0.16.1 enabled    dokku core docker-options plugin
+  domains              0.16.1 enabled    dokku core domains plugin
+  enter                0.16.1 enabled    dokku core enter plugin
+  git                  0.16.1 enabled    dokku core git plugin
+  logs                 0.16.1 enabled    dokku core logs plugin
+  named-containers     0.16.1 enabled    dokku core named containers plugin
+  network              0.16.1 enabled    dokku core network plugin
+  nginx-vhosts         0.16.1 enabled    dokku core nginx-vhosts plugin
+  plugin               0.16.1 enabled    dokku core plugin plugin
+  proxy                0.16.1 enabled    dokku core proxy plugin
+  ps                   0.16.1 enabled    dokku core ps plugin
+  repo                 0.16.1 enabled    dokku core repo plugin
+  shell                0.16.1 enabled    dokku core shell plugin
+  ssh-keys             0.16.1 enabled    dokku core ssh-keys plugin
+  storage              0.16.1 enabled    dokku core storage plugin
+  tags                 0.16.1 enabled    dokku core tags plugin
+  tar                  0.16.1 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 92080afec..920a0f46f 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 76d1ee7e3..57393bac2 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index af3e1715a..c6957eb66 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index f4e8f2608..faf766e07 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -13,6 +13,6 @@
     "0.13.4",
     "0.14.6",
     "0.15.5",
-    "0.16.0"
+    "0.16.1"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 6296987e3..b7489decf 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.16.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.16.1-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 8cd6cab89..25cbbe850 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh;
-sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh;
+sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index b72e7c738..478f97bc1 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 9716ff834..39060a53f 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 00b36788e..ea3ad59b2 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 6392bce2e..eda97d9dc 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index a24bfcd75..907f45195 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 8c2e4171b..8ad1cff72 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 8b8296f55..1033a7db7 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index e56dd8de2..a11ee8b19 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index ddfb7aafd..b5f111f7c 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index dbcb99fd3..e00718156 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 1b3045338..0269be02d 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index bca165fc1..ac10a064c 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index bfc1ae1cc..01ae1bf99 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 544072b93..b1b75638b 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 4eda6146f..96248231c 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 7a6f2633c..a2a9c53e5 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 829475525..86e45eebd 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 1de8eabfa..a05afbd98 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index bc96ced44..1b062b57e 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index ffc0d6849..83c40257b 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index b66a3db3c..d1bd0eac7 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 9315415a7..731a12413 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 5f67f115b..97321236a 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 3e2c075b7..9e32aadab 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index bc645a027..060626ec0 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 8e06158f6..3b364efea 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index e09eb2730..968a37d0c 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index a6e0f8c39..f78c52855 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index ce2ce52b5..0d3c3532c 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 553283f13..102f6e7ed 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.16.0"
+version = "0.16.1"
 [plugin.config]

From 2eccb95477bc17040b6b1d15d745bc8e4eca4043 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 11 May 2019 20:44:34 -0400
Subject: [PATCH 080/163] docs: Add help output for apps:exists

[ci skip]
---
 plugins/apps/internal-functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/apps/internal-functions b/plugins/apps/internal-functions
index 36cb1a637..fb2def2d4 100755
--- a/plugins/apps/internal-functions
+++ b/plugins/apps/internal-functions
@@ -85,6 +85,7 @@ apps_help_content_func() {
     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

From f4b96cc688ae7b406d895b017a0e138433756209 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 11 May 2019 20:47:32 -0400
Subject: [PATCH 081/163] docs: Add documentation for nginx-pre-reload
 limitation

Closes #3533

[ci skip]
---
 docs/development/plugin-triggers.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 7142cd3b5..11a2c0c63 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -586,6 +586,8 @@ echo "$NEW_SUBDOMAIN.$VHOST"
 
 ### `nginx-pre-reload`
 
+> Warning: The arguments INTERNAL_PORT and INTERNAL_IP_ADDRESS are no longer sufficient to retrieve all app listeners. Please run `plugn trigger network-get-listeners APP` within any implementation of `nginx-pre-reload` in order to retrieve all application listeners.
+
 - Description: Run before nginx reloads hosts
 - Invoked by: `dokku nginx:build-config`
 - Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS`

From c44db3f2cf75ff2117f00ad8b730a90b831f6e27 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 11 May 2019 20:51:17 -0400
Subject: [PATCH 082/163] Release 0.16.2

# History

## 0.16.2

Install/update via the bootstrap script:

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

### Documentation

- #3536: @josegonzalez docs: Add documentation for nginx-pre-reload limitation
- #3535: @josegonzalez Add help output for apps:exists
---
 HISTORY.md                                 | 14 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 125 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 66b0d5e1c..195bd81b2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,19 @@
 # History
 
+## 0.16.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh
+sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh
+```
+
+### Documentation
+
+- #3536: @josegonzalez docs: Add documentation for nginx-pre-reload limitation
+- #3535: @josegonzalez Add help output for apps:exists
+
 ## 0.16.1
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index eb5a8469e..bc2d3bb47 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh
-sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh
+sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index a3f8509cc..7b2f6fd97 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.16.1'
+VERSION = 'v0.16.2'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 7b9a706ef..66c339c6c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.16.1
+Version: 0.16.2
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index fd38542a9..baf0fc91c 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.16.1 enabled    dokku core standard plugin
-  20_events            0.16.1 enabled    dokku core events logging plugin
-  apps                 0.16.1 enabled    dokku core apps plugin
-  build-env            0.16.1 enabled    dokku core build-env plugin
-  certs                0.16.1 enabled    dokku core certificate management plugin
-  checks               0.16.1 enabled    dokku core checks plugin
-  common               0.16.1 enabled    dokku core common plugin
-  config               0.16.1 enabled    dokku core config plugin
-  docker-options       0.16.1 enabled    dokku core docker-options plugin
-  domains              0.16.1 enabled    dokku core domains plugin
-  enter                0.16.1 enabled    dokku core enter plugin
-  git                  0.16.1 enabled    dokku core git plugin
-  logs                 0.16.1 enabled    dokku core logs plugin
-  named-containers     0.16.1 enabled    dokku core named containers plugin
-  network              0.16.1 enabled    dokku core network plugin
-  nginx-vhosts         0.16.1 enabled    dokku core nginx-vhosts plugin
-  plugin               0.16.1 enabled    dokku core plugin plugin
-  proxy                0.16.1 enabled    dokku core proxy plugin
-  ps                   0.16.1 enabled    dokku core ps plugin
-  repo                 0.16.1 enabled    dokku core repo plugin
-  shell                0.16.1 enabled    dokku core shell plugin
-  ssh-keys             0.16.1 enabled    dokku core ssh-keys plugin
-  storage              0.16.1 enabled    dokku core storage plugin
-  tags                 0.16.1 enabled    dokku core tags plugin
-  tar                  0.16.1 enabled    dokku core tar plugin
+  00_dokku-standard    0.16.2 enabled    dokku core standard plugin
+  20_events            0.16.2 enabled    dokku core events logging plugin
+  apps                 0.16.2 enabled    dokku core apps plugin
+  build-env            0.16.2 enabled    dokku core build-env plugin
+  certs                0.16.2 enabled    dokku core certificate management plugin
+  checks               0.16.2 enabled    dokku core checks plugin
+  common               0.16.2 enabled    dokku core common plugin
+  config               0.16.2 enabled    dokku core config plugin
+  docker-options       0.16.2 enabled    dokku core docker-options plugin
+  domains              0.16.2 enabled    dokku core domains plugin
+  enter                0.16.2 enabled    dokku core enter plugin
+  git                  0.16.2 enabled    dokku core git plugin
+  logs                 0.16.2 enabled    dokku core logs plugin
+  named-containers     0.16.2 enabled    dokku core named containers plugin
+  network              0.16.2 enabled    dokku core network plugin
+  nginx-vhosts         0.16.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.16.2 enabled    dokku core plugin plugin
+  proxy                0.16.2 enabled    dokku core proxy plugin
+  ps                   0.16.2 enabled    dokku core ps plugin
+  repo                 0.16.2 enabled    dokku core repo plugin
+  shell                0.16.2 enabled    dokku core shell plugin
+  ssh-keys             0.16.2 enabled    dokku core ssh-keys plugin
+  storage              0.16.2 enabled    dokku core storage plugin
+  tags                 0.16.2 enabled    dokku core tags plugin
+  tar                  0.16.2 enabled    dokku core tar plugin
 ```
 
 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 920a0f46f..2a7500ffe 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 57393bac2..17ed2d80e 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index c6957eb66..bd3af0ec0 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index faf766e07..8249d26ff 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -13,6 +13,6 @@
     "0.13.4",
     "0.14.6",
     "0.15.5",
-    "0.16.1"
+    "0.16.2"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index b7489decf..93bacfaab 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.16.1-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.16.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 25cbbe850..5debb3d35 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh;
-sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 478f97bc1..6bad6516a 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.1/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.16.1 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 39060a53f..b66402ede 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index ea3ad59b2..842ddd1f7 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index eda97d9dc..4e24ae9d2 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 907f45195..dcfd11bc8 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 8ad1cff72..31f06daee 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 1033a7db7..78cb9f387 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index a11ee8b19..f754b7c43 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index b5f111f7c..6c42fbd91 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index e00718156..ff2224753 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 0269be02d..dcee49ae6 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index ac10a064c..f9ab3a70a 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 01ae1bf99..941b82b33 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index b1b75638b..bb72a1f5c 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 96248231c..be0a1a97b 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index a2a9c53e5..0568a6a4e 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 86e45eebd..dd4092886 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index a05afbd98..6fd1f5e95 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 1b062b57e..c0dd3f0b7 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 83c40257b..b42226ac0 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index d1bd0eac7..175d78fb1 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 731a12413..576aed722 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 97321236a..e951f1674 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 9e32aadab..159cc2636 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 060626ec0..3db2935ca 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 3b364efea..7966cd4c1 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 968a37d0c..018f10268 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index f78c52855..b49e4a80c 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 0d3c3532c..438739fb2 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 102f6e7ed..b3747dadb 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.16.1"
+version = "0.16.2"
 [plugin.config]

From d30a948be03873694070753e25e5be52cb4a2962 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 05:15:53 -0400
Subject: [PATCH 083/163] feat: silence dokku run 'errors'

In certain cases, a command can be specified but found - or not - in the Procfile, resulting in unnecessary output for cron tasks.

Closes #3522
---
 plugins/scheduler-docker-local/scheduler-run | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index 0b3a228ff..22a374204 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -47,11 +47,11 @@ scheduler-docker-local-scheduler-run() {
   DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
 
   POTENTIAL_PROCFILE_KEY="$1"
-  PROC_CMD=$(get_cmd_from_procfile "$APP" "$POTENTIAL_PROCFILE_KEY" || echo '')
+  PROC_CMD=$(get_cmd_from_procfile "$APP" "$POTENTIAL_PROCFILE_KEY" 2>/dev/null || echo '')
   remove_procfile "$APP"
 
   if [[ -n "$PROC_CMD" ]]; then
-    dokku_log_info1 "Found '$POTENTIAL_PROCFILE_KEY' in Procfile, running that command"
+    dokku_log_info1_quiet "Found '$POTENTIAL_PROCFILE_KEY' in Procfile, running that command"
     set -- "$PROC_CMD" "${@:2}"
   fi
 

From 4f23dd2dd6b8f6ab8b3b3b551b95689e5f88b7af Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 06:09:05 -0400
Subject: [PATCH 084/163] docs: Warn users when ufw is enabled

Closes #3455
---
 contrib/dokku-installer.py         | 13 +++++++++++++
 docs/networking/port-management.md |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 7b2f6fd97..a9c7da228 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -37,6 +37,15 @@ if os.path.isfile(key_file):
     except subprocess.CalledProcessError:
         pass
 
+ufw_display = 'block'
+try:
+    command = "sudo ufw status"
+    ufw_output = subprocess.check_output(command, shell=True).strip()
+    if "inactive" in ufw_output:
+        ufw_display = 'none'
+except subprocess.CalledProcessError:
+    ufw_display = 'none'
+
 
 def check_boot():
     if 'onboot' not in sys.argv:
@@ -77,6 +86,7 @@ def check_boot():
 class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_GET(self):
         content = PAGE.replace('{VERSION}', VERSION)
+        content = content.replace('{UFW_DISPLAY}', ufw_display)
         content = content.replace('{HOSTNAME}', hostname)
         content = content.replace('{AUTHORIZED_KEYS_LOCATION}', key_file)
         content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
@@ -294,6 +304,9 @@ PAGE = """
             <small class="form-text text-muted">When enabled, Nginx will be run on port 80 and proxy requests to apps based on hostname.</small>
             <small class="form-text text-muted">When disabled, a specific port will be setup for each application on first deploy, and requests to that port will be proxied to the relevant app.</small>
           </div>
+          <div class="alert alert-warning small mt-3 d-{UFW_DISPLAY}" role="alert">
+            <strong>Warning:</strong> UFW is active. To allow traffic to specific ports, run <code>sudo ufw allow PORT</code> for the port in question.
+          </div>
           <div class="bd-callout bd-callout-info">
             <h5>What will app URLs look like?</h5>
             <pre><code id="example">http://hostname:port</code></pre>
diff --git a/docs/networking/port-management.md b/docs/networking/port-management.md
index 3bd6db47e..94c07c486 100644
--- a/docs/networking/port-management.md
+++ b/docs/networking/port-management.md
@@ -14,6 +14,8 @@ In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into
 
 ## Usage
 
+> Warning: Mapping alternative ports may conflict with the active firewall installed on your server or hosting provider. Such software includes - but is not limited to - AWS Security Groups, iptables, and UFW. Please consult the documentation for those softwares as applicable.
+
 ### Proxy port mapping
 
 > New as of 0.6.0

From bc70a24e1df3e7413b1291c2c188d7f869c8e989 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 07:37:21 -0400
Subject: [PATCH 085/163] fix: handle case where image is null on first deploy

---
 plugins/common/functions | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/common/functions b/plugins/common/functions
index a5e7eaf19..8c3f59296 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -291,6 +291,10 @@ is_image_herokuish_based() {
   declare IMAGE="$1"
   local USER_VALUE
 
+  if [[ -z "$IMAGE" ]]; then
+    return 1
+  fi
+
   # due to how the build process works, all herokuish images have the Environment variable USER=herokuishuser
   USER_VALUE="$(docker inspect -f '{{range .Config.Env}}{{if eq . "USER=herokuishuser" }}{{println .}}{{end}}{{end}}' "$IMAGE")"
   [[ "$USER_VALUE" == "" ]] && return 1

From 6006303409323bea5d95983d6790501efb0d9719 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 18:58:28 -0400
Subject: [PATCH 086/163] docs: clarify that a dockerfile is still needed

[ci skip]
---
 docs/deployment/methods/dockerfiles.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/deployment/methods/dockerfiles.md b/docs/deployment/methods/dockerfiles.md
index 4433c6cb5..3139474dd 100644
--- a/docs/deployment/methods/dockerfiles.md
+++ b/docs/deployment/methods/dockerfiles.md
@@ -26,10 +26,15 @@ For security reasons - and as per [Docker recommendations](https://github.com/do
 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 '--file Dockerfile.dokku' # e.g. to use alternate Dockerfile
 dokku docker-options:add node-js-app build '--build-arg NODE_ENV=production'
 ```
 
+The location of the `Dockerfile` may also be specified. If the location is changed, the repository **must also** have a `Dockerfile` in the root directory in order to trigger a dockerfile-based deploy.
+
+```shell
+dokku docker-options:add node-js-app build '--file Dockerfile.dokku'
+```
+
 Once set, the Dockerfile usage would be as follows:
 
 ```Dockerfile

From 948d507909b89225c7248acae7692ae9271c9556 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 19:02:53 -0400
Subject: [PATCH 087/163] chore: update dockerignore for upcoming install from
 docker

[ci skip]
---
 .dockerignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 4ae7a89ec..84200e4bd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,3 +9,5 @@ tests
 !contrib/dokku-installer.py
 !contrib/dokku-update
 !contrib/bash-completion
+!contrib/docker
+vendor

From ca0b2937b9689a2bf66a15713d0d86bad0be5458 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 22 Apr 2019 16:34:06 -0400
Subject: [PATCH 088/163] refactor: fetch ssh key via argument before stdin

This allows the ssh-keys:add command to work in environments where there is no stdin/tty available, such as via server automation.
---
 plugins/ssh-keys/subcommands/add | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index ecd6c9746..0b6ec0d6d 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -7,22 +7,28 @@ source "$PLUGIN_AVAILABLE_PATH/ssh-keys/functions"
 add_keys() {
   declare desc="add a new key via sshcommand"
   local cmd="ssh-keys:add"
-  shift
-  local name="$1" key_file="$2" key_contents key_from_pipe
-  [[ -p /dev/stdin ]] && read -r key_from_pipe
-  if [[ -n "$key_from_pipe" ]]; then
-    ssh-keygen -lf /dev/stdin <<<"$key_from_pipe" &>/dev/null || dokku_log_fail "Key piped in is not a valid ssh public key"
-    key_contents="$key_from_pipe"
-  elif [[ -n "$key_file" ]]; then
-    key_contents="$(cat "$key_file")"
-    ssh-keygen -lf /dev/stdin <<<"$key_contents" &>/dev/null || dokku_log_fail "Key from file is not a valid ssh public key"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare NAME="$1" KEY_FILE="$2"
+  local key_contents
+
+  if [[ -n "$KEY_FILE" ]]; then
+    key_contents="$(cat "$KEY_FILE")"
+  elif [[ -p /dev/stdin ]]; then
+    read -r key_contents
+  else
+    dokku_log_fail "No key specified via file or pipe"
   fi
-  [[ -n "$name" && -n "$key_contents" ]] || dokku_log_fail "Two arguments are required if not piping, ie: dokku ssh-keys:add <NAME> <KEY_FILE>"
+
+  if [[ -n "$key_contents" ]]; then
+    dokku_log_fail "No key specified via file or pipe"
+  fi
+
   local count="$(wc -l <<<"$key_contents")"
-  [ "$count" -eq 1 ] || dokku_log_fail 'Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>'
+  [[ "$count" -eq 1 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
+  ssh-keygen -lf /dev/stdin <<<"$key_contents" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
   create_ssh_key_file
   verify_ssh_key_exists
-  echo "$key_contents" | sshcommand acl-add dokku "$name" || dokku_log_fail "sshcommand returned an error: $?"
+  echo "$key_contents" | sshcommand acl-add dokku "$NAME" || dokku_log_fail "sshcommand returned an error: $?"
   verify_ssh_key_file
 }
 

From 6a5bbd63a3741bc3fdd1c416089d1b40f8e9bf72 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 22 Apr 2019 16:49:50 -0400
Subject: [PATCH 089/163] refactor: always use a temp file for interacting with
 ssh keys

Rather than have stdin open everywhere, try to coerce input into a temporary file for later use.
---
 plugins/ssh-keys/subcommands/add | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index 0b6ec0d6d..6d05cf746 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -9,26 +9,31 @@ add_keys() {
   local cmd="ssh-keys:add"
   [[ "$1" == "$cmd" ]] && shift 1
   declare NAME="$1" KEY_FILE="$2"
-  local key_contents
+  local TMP_KEY_FILE
+  TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  trap 'rm -rf "$TMP_KEY_FILE" >/dev/null' RETURN INT TERM EXIT
 
   if [[ -n "$KEY_FILE" ]]; then
-    key_contents="$(cat "$KEY_FILE")"
+    true
   elif [[ -p /dev/stdin ]]; then
+    local key_contents
     read -r key_contents
+    echo "$key_contents" > "$TMP_KEY_FILE"
+    KEY_FILE="$TMP_KEY_FILE"
   else
     dokku_log_fail "No key specified via file or pipe"
   fi
 
-  if [[ -n "$key_contents" ]]; then
+  if [[ -s "$KEY_FILE" ]]; then
     dokku_log_fail "No key specified via file or pipe"
   fi
 
-  local count="$(wc -l <<<"$key_contents")"
+  local count="$(wc -l "$KEY_FILE")"
   [[ "$count" -eq 1 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
-  ssh-keygen -lf /dev/stdin <<<"$key_contents" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
+  ssh-keygen -lf "$KEY_FILE" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
   create_ssh_key_file
   verify_ssh_key_exists
-  echo "$key_contents" | sshcommand acl-add dokku "$NAME" || dokku_log_fail "sshcommand returned an error: $?"
+  sshcommand acl-add dokku "$NAME" "$KEY_FILE" || dokku_log_fail "sshcommand returned an error: $?"
   verify_ssh_key_file
 }
 

From 8551dfb2973818e8b2d535017c7a3e838fbf78d3 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 22 Apr 2019 16:52:53 -0400
Subject: [PATCH 090/163] refactor: switch to temporary file for key
 verification

---
 plugins/ssh-keys/functions | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/ssh-keys/functions b/plugins/ssh-keys/functions
index f18200830..8e4560fa7 100755
--- a/plugins/ssh-keys/functions
+++ b/plugins/ssh-keys/functions
@@ -14,9 +14,14 @@ verify_ssh_key_file() {
   declare desc="Test that public key is valid"
   [[ -s ${DOKKU_ROOT}/.ssh/authorized_keys ]] || dokku_log_fail "No public keys found."
   local key line=0
+  local TMP_KEY_FILE
+  TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  trap 'rm -rf "$TMP_KEY_FILE" >/dev/null' RETURN INT TERM EXIT
+
   while read -r key; do
     line=$((line + 1))
-    ssh-keygen -l -f /dev/stdin <<<"$key" &>/dev/null || dokku_log_fail "${DOKKU_ROOT}/.ssh/authorized_keys line $line failed ssh-keygen check."
+    echo "$key" >"$TMP_KEY_FILE"
+    ssh-keygen -lf "$TMP_KEY_FILE" &>/dev/null || dokku_log_fail "${DOKKU_ROOT}/.ssh/authorized_keys line $line failed ssh-keygen check."
   done <"${DOKKU_ROOT}/.ssh/authorized_keys"
 }
 

From a717cb99a362d116c6d26c4e09279f1b3797ae1e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 23 Apr 2019 12:21:43 -0400
Subject: [PATCH 091/163] fix: correct shfmt and update error message

---
 plugins/ssh-keys/subcommands/add | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index 6d05cf746..788a9d200 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -18,14 +18,14 @@ add_keys() {
   elif [[ -p /dev/stdin ]]; then
     local key_contents
     read -r key_contents
-    echo "$key_contents" > "$TMP_KEY_FILE"
+    echo "$key_contents" >"$TMP_KEY_FILE"
     KEY_FILE="$TMP_KEY_FILE"
   else
     dokku_log_fail "No key specified via file or pipe"
   fi
 
   if [[ -s "$KEY_FILE" ]]; then
-    dokku_log_fail "No key specified via file or pipe"
+    dokku_log_fail "Empty key was specified"
   fi
 
   local count="$(wc -l "$KEY_FILE")"

From 6ca4813247eff69fa21b72d04d68060a21c1ee41 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 23 Apr 2019 14:21:40 -0400
Subject: [PATCH 092/163] fix: invert check

---
 plugins/ssh-keys/subcommands/add | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index 788a9d200..395b17909 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -24,7 +24,7 @@ add_keys() {
     dokku_log_fail "No key specified via file or pipe"
   fi
 
-  if [[ -s "$KEY_FILE" ]]; then
+  if [[ ! -s "$KEY_FILE" ]]; then
     dokku_log_fail "Empty key was specified"
   fi
 

From dee0144c7c719904d10ff9f6f0f6d69a8aa95a5c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 19:08:55 -0400
Subject: [PATCH 093/163] fix: add missing awk to get number of lines in key
 file

---
 plugins/ssh-keys/subcommands/add | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index 395b17909..89242b8c3 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -28,7 +28,7 @@ add_keys() {
     dokku_log_fail "Empty key was specified"
   fi
 
-  local count="$(wc -l "$KEY_FILE")"
+  local count="$(wc -l "$KEY_FILE" | awk '{ print $1; }')"
   [[ "$count" -eq 1 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
   ssh-keygen -lf "$KEY_FILE" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
   create_ssh_key_file

From 287f383f6ca3604ffaeda980c69b973a5939d642 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 03:03:53 -0400
Subject: [PATCH 094/163] feat: add ability to clear global domains

---
 docs/configuration/domains.md      |  1 +
 plugins/domains/functions          |  8 ++++++++
 plugins/domains/internal-functions |  1 +
 tests/unit/20_domains.bats         | 18 ++++++++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/docs/configuration/domains.md b/docs/configuration/domains.md
index 1fc18556c..2bde4185f 100644
--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -6,6 +6,7 @@
 domains:add <app> <domain> [<domain> ...]      # Add domains to app
 domains:add-global <domain> [<domain> ...]     # Add global domain names
 domains:clear <app>                            # Clear all domains for app
+domains:clear-global                           # Clear global domain names
 domains:disable <app>                          # Disable VHOST support
 domains:enable <app>                           # Enable VHOST support
 domains:remove <app> <domain> [<domain> ...]   # Remove domains from app
diff --git a/plugins/domains/functions b/plugins/domains/functions
index 97e166ada..d0c6b8767 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -176,6 +176,14 @@ domains_add_global() {
   done
 }
 
+domains_clear_global() {
+  declare desc="remove all domains"
+  local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
+
+  rm "$GLOBAL_VHOST_PATH"
+  touch "$GLOBAL_VHOST_PATH"
+}
+
 domains_remove_global() {
   declare desc="remove list of domains"
   local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions
index 3897eef23..43267fe09 100755
--- a/plugins/domains/internal-functions
+++ b/plugins/domains/internal-functions
@@ -91,6 +91,7 @@ domains_help_content_func() {
     domains:add <app> <domain> [<domain> ...], Add domains to app
     domains:add-global <domain> [<domain> ...], Add global domain names
     domains:clear <app>, Clear all domains for app
+    domains:clear-global, Clear global domain names
     domains:disable <app>, Disable VHOST support
     domains:enable <app>, Enable VHOST support
     domains:remove <app> <domain> [<domain> ...], Remove domains from app
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 264246b2c..48192a4d0 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -234,6 +234,24 @@ teardown() {
   assert_success
 }
 
+@test "(domains) domains:clear-global" {
+  run /bin/bash -c "dokku domains:add-global global.dokku.invalid"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku domains:add-global global.dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku domains:clear-global"
+  echo "output: $output"
+  echo "status: $status"
+  refute_line "global.dokku.invalid"
+  refute_line "global.dokku.me"
+}
+
 @test "(domains) domains:remove-global" {
   run /bin/bash -c "dokku domains:add-global global.dokku.me"
   echo "output: $output"

From b429af8ff2401ecc84fc06d9b4719e567189a3a5 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 12 May 2019 07:36:02 -0400
Subject: [PATCH 095/163] feat: do not append the global domain for matching
 subdomains

If the subdomain is url-like, assume it is a valid url and use it for the default domain name. This allows users to specify the default domain for an app even if that is a subdomain of a global vhost.

Closes #3529
---
 docs/configuration/domains.md      | 15 ++-------------
 plugins/domains/functions          |  2 +-
 plugins/domains/internal-functions |  4 ++--
 tests/unit/20_domains.bats         | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/docs/configuration/domains.md b/docs/configuration/domains.md
index 1fc18556c..22df4a0ee 100644
--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -27,21 +27,10 @@ scheme://subdomain.domain.tld
 
 The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial dokku configuration. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
 
-If a FQDN such as `other.tld` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+If an FQDN such as `dokku.org` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `dokku.org`.
 
-You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
+You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed. See the [plugin trigger documentation](/docs/development/plugin-triggers.md#nginx-hostname) for more information.
 
-```shell
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
-
-NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
-echo "$NEW_SUBDOMAIN.$VHOST"
-```
-
-If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed.
 
 ## Disabling VHOSTS
 
diff --git a/plugins/domains/functions b/plugins/domains/functions
index 97e166ada..6bb3a662e 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -249,7 +249,7 @@ get_default_vhosts() {
         local SUBDOMAIN=${APP/%\.${VHOST}/}
         local hostname=$(: | plugn trigger nginx-hostname "$APP" "$SUBDOMAIN" "$VHOST")
         if [[ -z $hostname ]]; then
-          if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
+          if [[ "$APP" == *.* ]]; then
             local hostname="${APP/\//-}"
           else
             local hostname="${APP/\//-}.$VHOST"
diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions
index 3897eef23..6dd5dc220 100755
--- a/plugins/domains/internal-functions
+++ b/plugins/domains/internal-functions
@@ -44,13 +44,13 @@ cmd-domains-report-single() {
     verify_app_name "$APP"
     app_flags=(
       "--domains-app-enabled: $(fn-domains-app-enabled "$APP")"
-      "--domains-app-vhosts: $(fn-domains-app-vhosts "$APP")"
+      "--domains-app-vhosts: $(fn-domains-app-vhosts "$APP" | awk '{$1=$1};1')"
     )
   fi
 
   global_flags=(
     "--domains-global-enabled: $(fn-domains-global-enabled)"
-    "--domains-global-vhosts: $(fn-domains-global-vhosts)"
+    "--domains-global-vhosts: $(fn-domains-global-vhosts | awk '{$1=$1};1')"
   )
 
   flag_map=("${app_flags[@]}" "${global_flags[@]}")
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 264246b2c..76dc3e884 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -284,3 +284,22 @@ teardown() {
   assert_line ${TEST_APP}.global3.dokku.me
   assert_line ${TEST_APP}.global4.dokku.me
 }
+
+@test "(domains) app name overlaps with global domain.tld" {
+  run /bin/bash -c "dokku domains:set-global dokku.test"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  # run domains:clear in order to invoke default vhost creation
+  dokku --quiet apps:create test.dokku.test
+  dokku --quiet domains:clear test.dokku.test
+
+  run /bin/bash -c "dokku domains:report test.dokku.test --domains-app-vhosts"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "test.dokku.test"
+
+  dokku --force apps:destroy test.dokku.test
+}

From ba3af25423752e2bb080ab576d6aa70008992868 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 13:54:35 -0400
Subject: [PATCH 096/163] Release 0.16.3

# History

## 0.16.3

Install/update via the bootstrap script:

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

### Bug Fixes

- #3541: @josegonzalez Handle case where image is null on first deploy

### New Features

- #3543: @josegonzalez Add ability to clear global domains
- #3517: @josegonzalez SSH key updates
- #3538: @josegonzalez Silence dokku run 'errors'

### Documentation

- #3523: @MarcDiethelm Add an example how to specify a Dockerfile for deployment
- #3539: @josegonzalez Warn users when ufw is enabled
---
 HISTORY.md                                 | 24 +++++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 135 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 195bd81b2..483f6803e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,29 @@
 # History
 
+## 0.16.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh
+sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3541: @josegonzalez Handle case where image is null on first deploy
+
+### New Features
+
+- #3543: @josegonzalez Add ability to clear global domains
+- #3517: @josegonzalez SSH key updates
+- #3538: @josegonzalez Silence dokku run 'errors'
+
+### Documentation
+
+- #3523: @MarcDiethelm Add an example how to specify a Dockerfile for deployment
+- #3539: @josegonzalez Warn users when ufw is enabled
+
 ## 0.16.2
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index bc2d3bb47..865004569 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh
-sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh
+sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index a9c7da228..8f4c2a14c 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.16.2'
+VERSION = 'v0.16.3'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 66c339c6c..55937847b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.16.2
+Version: 0.16.3
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index baf0fc91c..34c59b4f0 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.16.2 enabled    dokku core standard plugin
-  20_events            0.16.2 enabled    dokku core events logging plugin
-  apps                 0.16.2 enabled    dokku core apps plugin
-  build-env            0.16.2 enabled    dokku core build-env plugin
-  certs                0.16.2 enabled    dokku core certificate management plugin
-  checks               0.16.2 enabled    dokku core checks plugin
-  common               0.16.2 enabled    dokku core common plugin
-  config               0.16.2 enabled    dokku core config plugin
-  docker-options       0.16.2 enabled    dokku core docker-options plugin
-  domains              0.16.2 enabled    dokku core domains plugin
-  enter                0.16.2 enabled    dokku core enter plugin
-  git                  0.16.2 enabled    dokku core git plugin
-  logs                 0.16.2 enabled    dokku core logs plugin
-  named-containers     0.16.2 enabled    dokku core named containers plugin
-  network              0.16.2 enabled    dokku core network plugin
-  nginx-vhosts         0.16.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.16.2 enabled    dokku core plugin plugin
-  proxy                0.16.2 enabled    dokku core proxy plugin
-  ps                   0.16.2 enabled    dokku core ps plugin
-  repo                 0.16.2 enabled    dokku core repo plugin
-  shell                0.16.2 enabled    dokku core shell plugin
-  ssh-keys             0.16.2 enabled    dokku core ssh-keys plugin
-  storage              0.16.2 enabled    dokku core storage plugin
-  tags                 0.16.2 enabled    dokku core tags plugin
-  tar                  0.16.2 enabled    dokku core tar plugin
+  00_dokku-standard    0.16.3 enabled    dokku core standard plugin
+  20_events            0.16.3 enabled    dokku core events logging plugin
+  apps                 0.16.3 enabled    dokku core apps plugin
+  build-env            0.16.3 enabled    dokku core build-env plugin
+  certs                0.16.3 enabled    dokku core certificate management plugin
+  checks               0.16.3 enabled    dokku core checks plugin
+  common               0.16.3 enabled    dokku core common plugin
+  config               0.16.3 enabled    dokku core config plugin
+  docker-options       0.16.3 enabled    dokku core docker-options plugin
+  domains              0.16.3 enabled    dokku core domains plugin
+  enter                0.16.3 enabled    dokku core enter plugin
+  git                  0.16.3 enabled    dokku core git plugin
+  logs                 0.16.3 enabled    dokku core logs plugin
+  named-containers     0.16.3 enabled    dokku core named containers plugin
+  network              0.16.3 enabled    dokku core network plugin
+  nginx-vhosts         0.16.3 enabled    dokku core nginx-vhosts plugin
+  plugin               0.16.3 enabled    dokku core plugin plugin
+  proxy                0.16.3 enabled    dokku core proxy plugin
+  ps                   0.16.3 enabled    dokku core ps plugin
+  repo                 0.16.3 enabled    dokku core repo plugin
+  shell                0.16.3 enabled    dokku core shell plugin
+  ssh-keys             0.16.3 enabled    dokku core ssh-keys plugin
+  storage              0.16.3 enabled    dokku core storage plugin
+  tags                 0.16.3 enabled    dokku core tags plugin
+  tar                  0.16.3 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 2a7500ffe..636a763b5 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 17ed2d80e..78bf189e7 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index bd3af0ec0..867b3e6ec 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 8249d26ff..673409367 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -13,6 +13,6 @@
     "0.13.4",
     "0.14.6",
     "0.15.5",
-    "0.16.2"
+    "0.16.3"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 93bacfaab..1aab84ad4 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.16.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.16.3-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 5debb3d35..64fd92b63 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh;
-sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh;
+sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 6bad6516a..eb441b20a 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.16.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index b66402ede..862dc6fbd 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 842ddd1f7..4ca9eeba8 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 4e24ae9d2..4ea8dd896 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index dcfd11bc8..2ebf3b681 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 31f06daee..214e110f4 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 78cb9f387..eb8d76aec 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index f754b7c43..4e2ca7327 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 6c42fbd91..1ddfc1bab 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index ff2224753..91a4b26ff 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index dcee49ae6..829d432bc 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index f9ab3a70a..ea14d7e64 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 941b82b33..5518fb1dc 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index bb72a1f5c..89544c09a 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index be0a1a97b..d2b3c725b 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 0568a6a4e..387adface 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index dd4092886..de786705e 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 6fd1f5e95..f4fc9014b 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index c0dd3f0b7..21abb8db2 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index b42226ac0..af102adae 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 175d78fb1..2430fbd61 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 576aed722..7590da980 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index e951f1674..f665a6af4 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 159cc2636..ace8ba1ea 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 3db2935ca..59d1c095e 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 7966cd4c1..ddac0f6d5 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 018f10268..c7bc1f56c 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index b49e4a80c..b40639ad0 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 438739fb2..de215c1be 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index b3747dadb..93fd6158a 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.16.2"
+version = "0.16.3"
 [plugin.config]

From 0cf03baa7882f18d2d8623f4dc1ede3be271e32e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 16:05:27 -0400
Subject: [PATCH 097/163] feat: add ability to trigger an arbitrary plugin hook
 This is useful in cases where the command output must be tested, but it is
 otherwise embedded in a specific part of the dokku core. As the 'plugin'
 commands require root, this is safe to add to the core.

---
 docs/advanced-usage/plugin-management.md |  1 +
 plugins/plugin/commands                  |  9 +++++----
 plugins/plugin/subcommands/trigger       | 13 +++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100755 plugins/plugin/subcommands/trigger

diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 34c59b4f0..c8b3a778b 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -8,6 +8,7 @@ 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:trigger <args...>.                # Trigger an arbitrary plugin hook
 plugin:uninstall <name>                  # Uninstall a plugin (third-party only)
 plugin:update [name [committish]]        # Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
 ```
diff --git a/plugins/plugin/commands b/plugins/plugin/commands
index 0722d5002..7b436b331 100755
--- a/plugins/plugin/commands
+++ b/plugins/plugin/commands
@@ -8,13 +8,14 @@ case "$1" in
     help_content_func() {
       declare desc="return plugin plugin help content"
       cat <<help_content
-    plugin:list, Print active plugins
+    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:update [name [committish]], Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
-    plugin:enable <name>, Enable a previously disabled plugin
-    plugin:disable <name>, Disable an installed plugin (third-party only)
+    plugin:list, Print active plugins
+    plugin:trigger <args...>, Trigger an arbitrary plugin hook
     plugin:uninstall <name>, Uninstall a plugin (third-party only)
+    plugin:update [name [committish]], Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
 help_content
     }
 
diff --git a/plugins/plugin/subcommands/trigger b/plugins/plugin/subcommands/trigger
new file mode 100755
index 000000000..94a58d78f
--- /dev/null
+++ b/plugins/plugin/subcommands/trigger
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+plugin_trigger_cmd() {
+  declare desc="trigger an arbitrary plugin hook"
+  local cmd="plugin:trigger"
+  [[ "$1" == "$cmd" ]] && shift 1
+
+  plugn trigger "$@"
+}
+
+plugin_trigger_cmd "$@"

From 603dc0fad6ccd02f00248142cb99cc1a92dc4f87 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 16:37:57 -0400
Subject: [PATCH 098/163] fix: correct retrieval of resource values for
 alternative schedulers

---
 plugins/resource/resource.go                                | 6 +++---
 .../triggers/resource-get-property/resource-get-property.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go
index 526589cca..eeeebb0a2 100644
--- a/plugins/resource/resource.go
+++ b/plugins/resource/resource.go
@@ -75,11 +75,11 @@ func GetResourceValue(appName string, processType string, resourceType string, k
 	}
 
 	defaultValue := ""
-	for key, value := range resources {
-		if key == propertyKey("_default_", resourceType, key) {
+	for k, value := range resources {
+		if k == propertyKey("_default_", resourceType, key) {
 			defaultValue = value
 		}
-		if key == propertyKey(processType, resourceType, key) {
+		if k == propertyKey(processType, resourceType, key) {
 			return value, nil
 		}
 	}
diff --git a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
index 53d22effc..cacd856d9 100644
--- a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
+++ b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go
@@ -14,8 +14,8 @@ func main() {
 	flag.Parse()
 	appName := flag.Arg(0)
 	processType := flag.Arg(1)
-	resourceType := flag.Arg(1)
-	key := flag.Arg(1)
+	resourceType := flag.Arg(2)
+	key := flag.Arg(3)
 
 	value, err := resource.GetResourceValue(appName, processType, resourceType, key)
 	if err != nil {

From de43eb1e3da38e49c60281e998e2194e245aa8f2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 16:39:33 -0400
Subject: [PATCH 099/163] Release 0.16.4

# History

## 0.16.4

Install/update via the bootstrap script:

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

### Bug Fixes

- #3547: @josegonzalez Correct retrieval of resource values for alternative schedulers

### New Features

- #3546: @josegonzalez Add ability to trigger an arbitrary plugin hook
---
 HISTORY.md                                 | 17 ++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 41 files changed, 128 insertions(+), 111 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 483f6803e..f3a5d875f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,22 @@
 # History
 
+## 0.16.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh
+sudo DOKKU_TAG=v0.16.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3547: @josegonzalez Correct retrieval of resource values for alternative schedulers
+
+### New Features
+
+- #3546: @josegonzalez Add ability to trigger an arbitrary plugin hook
+
 ## 0.16.3
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 865004569..6597079ca 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh
-sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh
+sudo DOKKU_TAG=v0.16.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.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 8f4c2a14c..ab5cc4be2 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.16.3'
+VERSION = 'v0.16.4'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 55937847b..bb942b760 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.16.3
+Version: 0.16.4
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index c8b3a778b..7850baa78 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.16.3 enabled    dokku core standard plugin
-  20_events            0.16.3 enabled    dokku core events logging plugin
-  apps                 0.16.3 enabled    dokku core apps plugin
-  build-env            0.16.3 enabled    dokku core build-env plugin
-  certs                0.16.3 enabled    dokku core certificate management plugin
-  checks               0.16.3 enabled    dokku core checks plugin
-  common               0.16.3 enabled    dokku core common plugin
-  config               0.16.3 enabled    dokku core config plugin
-  docker-options       0.16.3 enabled    dokku core docker-options plugin
-  domains              0.16.3 enabled    dokku core domains plugin
-  enter                0.16.3 enabled    dokku core enter plugin
-  git                  0.16.3 enabled    dokku core git plugin
-  logs                 0.16.3 enabled    dokku core logs plugin
-  named-containers     0.16.3 enabled    dokku core named containers plugin
-  network              0.16.3 enabled    dokku core network plugin
-  nginx-vhosts         0.16.3 enabled    dokku core nginx-vhosts plugin
-  plugin               0.16.3 enabled    dokku core plugin plugin
-  proxy                0.16.3 enabled    dokku core proxy plugin
-  ps                   0.16.3 enabled    dokku core ps plugin
-  repo                 0.16.3 enabled    dokku core repo plugin
-  shell                0.16.3 enabled    dokku core shell plugin
-  ssh-keys             0.16.3 enabled    dokku core ssh-keys plugin
-  storage              0.16.3 enabled    dokku core storage plugin
-  tags                 0.16.3 enabled    dokku core tags plugin
-  tar                  0.16.3 enabled    dokku core tar plugin
+  00_dokku-standard    0.16.4 enabled    dokku core standard plugin
+  20_events            0.16.4 enabled    dokku core events logging plugin
+  apps                 0.16.4 enabled    dokku core apps plugin
+  build-env            0.16.4 enabled    dokku core build-env plugin
+  certs                0.16.4 enabled    dokku core certificate management plugin
+  checks               0.16.4 enabled    dokku core checks plugin
+  common               0.16.4 enabled    dokku core common plugin
+  config               0.16.4 enabled    dokku core config plugin
+  docker-options       0.16.4 enabled    dokku core docker-options plugin
+  domains              0.16.4 enabled    dokku core domains plugin
+  enter                0.16.4 enabled    dokku core enter plugin
+  git                  0.16.4 enabled    dokku core git plugin
+  logs                 0.16.4 enabled    dokku core logs plugin
+  named-containers     0.16.4 enabled    dokku core named containers plugin
+  network              0.16.4 enabled    dokku core network plugin
+  nginx-vhosts         0.16.4 enabled    dokku core nginx-vhosts plugin
+  plugin               0.16.4 enabled    dokku core plugin plugin
+  proxy                0.16.4 enabled    dokku core proxy plugin
+  ps                   0.16.4 enabled    dokku core ps plugin
+  repo                 0.16.4 enabled    dokku core repo plugin
+  shell                0.16.4 enabled    dokku core shell plugin
+  ssh-keys             0.16.4 enabled    dokku core ssh-keys plugin
+  storage              0.16.4 enabled    dokku core storage plugin
+  tags                 0.16.4 enabled    dokku core tags plugin
+  tar                  0.16.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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 636a763b5..459faef80 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 78bf189e7..d9c4e7305 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 867b3e6ec..a5e7166f5 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 673409367..f0af9e36a 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -13,6 +13,6 @@
     "0.13.4",
     "0.14.6",
     "0.15.5",
-    "0.16.3"
+    "0.16.4"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 1aab84ad4..66aafc25c 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.16.3-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.16.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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 64fd92b63..a93b60f95 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh;
-sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh;
+sudo DOKKU_TAG=v0.16.4 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index eb441b20a..1834dfeae 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.3/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.16.3 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.16.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>
diff --git a/docs/template.html b/docs/template.html
index 862dc6fbd..b7e37790f 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 4ca9eeba8..b8fd33853 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 4ea8dd896..f6325b060 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 2ebf3b681..c47a642af 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 214e110f4..f02356bfb 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index eb8d76aec..70bff0c83 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 4e2ca7327..ea39365c8 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 1ddfc1bab..7f70f2dd8 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 91a4b26ff..b0733c267 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 829d432bc..462d2b5e0 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index ea14d7e64..afb412335 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 5518fb1dc..055c580c5 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 89544c09a..b86a7f58d 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index d2b3c725b..ed84e2499 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 387adface..6dad4ba3c 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index de786705e..756dda4a8 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index f4fc9014b..3f80df571 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 21abb8db2..360671cac 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index af102adae..9c8a0634f 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 2430fbd61..e470a03a7 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 7590da980..db205128e 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index f665a6af4..fbd2aae74 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index ace8ba1ea..20922545e 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 59d1c095e..b561c5a73 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index ddac0f6d5..caf750412 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index c7bc1f56c..01b425ea8 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index b40639ad0..641ee7837 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index de215c1be..2cbd5d99d 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 93fd6158a..1d16ea7ae 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.16.3"
+version = "0.16.4"
 [plugin.config]

From ad804f6d3f28a6df9d30641e7ff5049c6aaf2ffa Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 17:32:10 -0400
Subject: [PATCH 100/163] docs: remove outdated global resource setting

This was removed in c9bbddcfcbbcad64dd9453afec77ba614598fc67 as it was more complicated for operators to figure out _exactly_ which combination of limits/reservations would apply to their applications. Unfortunately, the documentation was never updated.

We may re-add this functionality in the future, but for now, cleaning up the docs is the best option.

[ci skip]
---
 docs/advanced-usage/resource-management.md | 116 ---------------------
 1 file changed, 116 deletions(-)

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 02227dd88..5e8916a21 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -83,64 +83,6 @@ dokku resource:limits node-js-app
        network-egress:
 ```
 
-#### Global Resource Limits
-
-By default, Dokku does not limit any resources, though these can be specified at the server level via the `--global` flag on the `resource:limit` command.
-
-```shell
-dokku resource:limit --global --memory 200
-```
-
-```
-=====> Setting default resource limits
-       memory: 200
-```
-
-This may also be combined with the `--process-type` flag to set global limits on a process-type level:
-
-```shell
-dokku resource:limit --global --memory 150 --process-type web node-js-app
-```
-
-```
-=====> Setting default resource limits (web)
-       memory: 150
-```
-
-#### Displaying Global Resource Limits
-
-Running the `resource:limit` command with only the `--global` flag will display the currently configured default limits.
-
-```shell
-dokku resource:limit --global
-```
-
-```
-=====> resource limits default information
-       cpu:
-       memory: 200
-       memory-swap:
-       network:
-       network-ingress:
-       network-egress:
-```
-
-This may also be combined with the `--process-type` flag to see global limits on a process-type level:
-
-```shell
-dokku resource:limit --global --process-type web
-```
-
-```
-=====> resource limits default information (web)
-       cpu:
-       memory-swap:
-       memory: 150
-       network-egress:
-       network-ingress:
-       network:
-```
-
 #### Clearing Resource Limits
 
 In cases where the values are incorrect - or there is no desire to limit resources - resource limits may be cleared using the `resource:limit-clear` command.
@@ -217,64 +159,6 @@ dokku resource:reserve node-js-app
        network-egress:
 ```
 
-#### Global Resource Reservations
-
-By default, Dokku does not reserve any resources, though these can be specified at the server level via the `--global` flag on the `resource:reserve` command.
-
-```shell
-dokku resource:reserve --global --memory 200
-```
-
-```
-=====> Setting default resource reservation
-       memory: 200
-```
-
-This may also be combined with the `--process-type` flag to set global reservations on a process-type level:
-
-```shell
-dokku resource:reserve --global --memory 150 --process-type web node-js-app
-```
-
-```
-=====> Setting default resource reservation (web)
-       memory: 150
-```
-
-#### Displaying Global Resource Reservations
-
-Running the `resource:reserve` command with only the `--global` flag will display the currently configured default reservation.
-
-```shell
-dokku resource:reserve --global
-```
-
-```
-=====> resource reservation default information
-       cpu:
-       memory: 200
-       memory-swap:
-       network:
-       network-ingress:
-       network-egress:
-```
-
-This may also be combined with the `--process-type` flag to see global reservations on a process-type level:
-
-```shell
-dokku resource:reserve --global --process-type web
-```
-
-```
-=====> resource reservation default information (web)
-       cpu:
-       memory-swap:
-       memory: 150
-       network-egress:
-       network-ingress:
-       network:
-```
-
 #### Clearing Resource Reservations
 
 In cases where the values are incorrect - or there is no desire to reserve resources - resource reservations may be cleared using the `resource:reserve-clear` command.

From aab390edb6a43286abb7c7767896b54d2f028230 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Tue, 14 May 2019 23:20:58 +0900
Subject: [PATCH 101/163] Switch from rawgit to jsdelivr in manifest.json too

ref https://github.com/dokku/dokku/commit/bb8d0324b560e2bf78c9a99a062eb3388d670480
---
 docs/assets/favicons/manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index d9c4e7305..95d504505 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"

From e59f115311af0840b68b416d04d27600a84530aa Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 14 May 2019 11:59:44 -0400
Subject: [PATCH 102/163] fix: add missing domains:clear-global command

---
 plugins/domains/subcommands/clear-global | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 plugins/domains/subcommands/clear-global

diff --git a/plugins/domains/subcommands/clear-global b/plugins/domains/subcommands/clear-global
new file mode 100755
index 000000000..6cb1e2366
--- /dev/null
+++ b/plugins/domains/subcommands/clear-global
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/domains/functions"
+
+domains_clear_global_cmd() {
+  declare desc="clear global domain names via command line"
+  local cmd="domains:clear-global"
+  shift 1
+
+  domains_clear_global "$@"
+}
+
+domains_add_global_cmd "$@"

From 72fce08e8752b2206b0a8aeae1f9e00fc5f29a5c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 13 May 2019 18:18:32 -0400
Subject: [PATCH 103/163] feat: add message indicating that the user is looking
 at default limits/reservations

Without this bit of metadata, it appears to the user that the resource limits are just that, whereas this is actually scoped to per-process-type.
---
 docs/advanced-usage/resource-management.md | 49 +++++++++++++++++++---
 plugins/resource/subcommands.go            |  4 +-
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-usage/resource-management.md b/docs/advanced-usage/resource-management.md
index 5e8916a21..6e489d0b8 100644
--- a/docs/advanced-usage/resource-management.md
+++ b/docs/advanced-usage/resource-management.md
@@ -70,11 +70,31 @@ dokku resource:limit --cpu 100 --memory 100 --process-type worker node-js-app
 
 #### Displaying Resource Limits
 
-Running the `resource:limits` command without any flags will display the currently configured app reservation.
+Running the `resource:limit` command without any flags will display the currently configured default app limits.
 
 ```shell
-dokku resource:limits node-js-app
-=====> resource limits node-js-app information
+dokku resource:limit node-js-app
+```
+
+```
+=====> resource limits node-js-app information [defaults]
+       cpu:
+       memory:
+       memory-swap: 100
+       network: 100
+       network-ingress:
+       network-egress:
+```
+
+This may also be combined with the `--process-type` flag to see app limits on a process-type level. Note that the displayed values are not merged with the defaults.
+
+
+```shell
+dokku resource:limit --process-type web node-js-app
+```
+
+```
+=====> resource limits node-js-app information (web)
        cpu: 100
        memory: 100
        memory-swap:
@@ -146,11 +166,30 @@ dokku resource:reserve --cpu 100 --memory 100 --process-type worker node-js-app
 
 #### Displaying Resource Reservations
 
-Running the `resource:reserve` command without any flags will display the currently configured app reservation.
+Running the `resource:reserve` command without any flags will display the currently configured default app reservations.
 
 ```shell
 dokku resource:reserve node-js-app
-=====> resource reservation node-js-app information
+```
+
+```
+=====> resource reservation node-js-app information [defaults]
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
+This may also be combined with the `--process-type` flag to see app reservations on a process-type level. Note that the displayed values are not merged with the defaults.
+
+```shell
+dokku resource:reserve --process-type web node-js-app
+```
+
+```
+=====> resource reservation node-js-app information (web)
        cpu: 100
        memory: 100
        memory-swap:
diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index f93a4672a..e3a8f68b6 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -142,7 +142,9 @@ func reportResourceType(appName string, processType string, resourceType string)
 	}
 
 	message := fmt.Sprintf("resource %v %v information", noun, appName)
-	if processType != "_default_" {
+	if processType == "_default_" {
+		message = fmt.Sprintf("%v [defaults]", message)
+	} else {
 		message = fmt.Sprintf("%v (%v)", message, processType)
 	}
 	common.LogInfo2Quiet(message)

From 343a6a159fff80a8df66c21917b37f3d994472ef Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 14 May 2019 17:55:00 -0400
Subject: [PATCH 104/163] docs: standardize on node-js-app in examples

[ci skip]
---
 docs/configuration/domains.md            | 10 +++++-----
 docs/configuration/ssl.md                | 20 ++++++++++----------
 docs/deployment/zero-downtime-deploys.md | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/configuration/domains.md b/docs/configuration/domains.md
index 2bde4185f..ffbb4d4d5 100644
--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -89,17 +89,17 @@ dokku domains:report
 ```
 =====> node-js-app domains information
        Domains app enabled: true
-       Domains app vhosts:  node-js-sample.dokku.org
+       Domains app vhosts:  node-js-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
-=====> python-sample domains information
+=====> python-app domains information
        Domains app enabled: true
-       Domains app vhosts:  python-sample.dokku.org
+       Domains app vhosts:  python-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
-=====> ruby-sample domains information
+=====> ruby-app domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  ruby-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
 ```
diff --git a/docs/configuration/ssl.md b/docs/configuration/ssl.md
index 63cb930c7..5e44b72f3 100644
--- a/docs/configuration/ssl.md
+++ b/docs/configuration/ssl.md
@@ -67,17 +67,17 @@ dokku certs:report
 ```
 
 ```
-=====> node-js-sample
-       Ssl dir:             /home/dokku/node-js-sample/tls
+=====> node-js-app
+       Ssl dir:             /home/dokku/node-js-app/tls
        Ssl enabled:         true
-       Ssl hostnames:       *.node-js-sample.org node-js-sample.org
+       Ssl hostnames:       *.node-js-app.org node-js-app.org
        Ssl expires at:      Oct  5 23:59:59 2019 GMT
        Ssl issuer:          C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO RSA Domain Validation Secure Server CA
        Ssl starts at:       Oct  5 00:00:00 2016 GMT
-       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.node-js-sample.org
+       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.node-js-app.org
        Ssl verified:        self signed.
-=====> python-sample
-       Ssl dir:             /home/dokku/python-sample/tls
+=====> python-app
+       Ssl dir:             /home/dokku/python-app/tls
        Ssl enabled:         false
        Ssl hostnames:
        Ssl expires at:
@@ -90,12 +90,12 @@ dokku certs:report
 You can run the command for a specific app also.
 
 ```shell
-dokku certs:report node-js-sample
+dokku certs:report node-js-app
 ```
 
 ```
-=====> node-js-sample ssl information
-       Ssl dir:             /home/dokku/node-js-sample/tls
+=====> node-js-app ssl information
+       Ssl dir:             /home/dokku/node-js-app/tls
        Ssl enabled:         true
        Ssl hostnames:       *.dokku.org dokku.org
        Ssl expires at:      Oct  5 23:59:59 2019 GMT
@@ -108,7 +108,7 @@ dokku certs:report node-js-sample
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku certs:report node-js-sample --ssl-enabled
+dokku certs:report node-js-app --ssl-enabled
 ```
 
 ## HSTS Header
diff --git a/docs/deployment/zero-downtime-deploys.md b/docs/deployment/zero-downtime-deploys.md
index ebcccc9df..7ebee5124 100644
--- a/docs/deployment/zero-downtime-deploys.md
+++ b/docs/deployment/zero-downtime-deploys.md
@@ -81,13 +81,13 @@ dokku checks:report
 ```
 
 ```
-=====> search checks information
+=====> node-js-app checks information
        Checks disabled list: none
        Checks skipped list: none          
-=====> python-sample checks information
+=====> python-app checks information
        Checks disabled list: none
        Checks skipped list: none          
-=====> ruby-sample checks information
+=====> ruby-app checks information
        Checks disabled list: _all_
        Checks skipped list: none          
 ```
@@ -95,11 +95,11 @@ dokku checks:report
 You can run the command for a specific app also.
 
 ```shell
-dokku checks:report node-js-sample
+dokku checks:report node-js-app
 ```
 
 ```
-=====> node-js-sample checks information
+=====> node-js-app checks information
        Checks disabled list: none
        Checks skipped list: none          
 ```
@@ -107,7 +107,7 @@ dokku checks:report node-js-sample
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku checks:report node-js-sample --checks-disabled-list
+dokku checks:report node-js-app --checks-disabled-list
 ```
 
 ## Customizing checks

From 68fcd673270ba49602176ecf7c2f259e2e50cf2f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 14 May 2019 18:01:39 -0400
Subject: [PATCH 105/163] feat: Add nginx:show-conf command

Closes #3552
---
 plugins/nginx-vhosts/subcommands/show-conf | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 plugins/nginx-vhosts/subcommands/show-conf

diff --git a/plugins/nginx-vhosts/subcommands/show-conf b/plugins/nginx-vhosts/subcommands/show-conf
new file mode 100755
index 000000000..e4de915d4
--- /dev/null
+++ b/plugins/nginx-vhosts/subcommands/show-conf
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+nginx_show_conf_cmd() {
+  declare desc="display app nginx conf"
+  declare cmd="nginx:show-conf" argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare APP="$1"
+  verify_app_name "$APP"
+
+  if [[ ! -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
+    dokku_log_fail "No nginx.conf exists for $APP"
+  fi
+
+  cat "$DOKKU_ROOT/$APP/nginx.conf"
+}
+
+nginx_show_conf_cmd "$@"

From 3fb8a576a05ddc2115d0816470b85d48d74cc30b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 16 May 2019 18:24:37 -0400
Subject: [PATCH 106/163] fix: add trace:on and trace:off

Closes #3553
---
 ISSUE_TEMPLATE.md                             |  8 ++-
 docs/configuration/environment-variables.md   |  2 +-
 docs/getting-started/troubleshooting.md       | 50 +++++++++++++------
 plugins/trace/commands                        | 16 ++++++
 plugins/trace/internal-functions              | 28 +++++++++++
 plugins/trace/plugin.toml                     |  4 ++
 .../trace => trace/subcommands/default}       | 12 +++--
 plugins/trace/subcommands/off                 | 15 ++++++
 plugins/trace/subcommands/on                  | 15 ++++++
 9 files changed, 123 insertions(+), 27 deletions(-)
 create mode 100755 plugins/trace/commands
 create mode 100755 plugins/trace/internal-functions
 create mode 100755 plugins/trace/plugin.toml
 rename plugins/{00_dokku-standard/subcommands/trace => trace/subcommands/default} (67%)
 create mode 100755 plugins/trace/subcommands/off
 create mode 100755 plugins/trace/subcommands/on

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index a167f728c..a1b729960 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -29,9 +29,7 @@
 
 ### 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.
+- Container Inspect Output (if applicable) via `dokku inspect APP_NAME`
 - `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:
@@ -40,5 +38,5 @@
   - If using buildpacks, which custom buildpacks are in use
   - If using a `Dockerfile`, the contents of that file
   - If it exists, the contents of your `Procfile`.
-- Output of failing Dokku commands after running `dokku trace on`
-  (BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+- Output of failing Dokku commands after running `dokku trace:on`
+  (BEWARE: `trace:on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
diff --git a/docs/configuration/environment-variables.md b/docs/configuration/environment-variables.md
index 435372e09..c6a5cfda6 100644
--- a/docs/configuration/environment-variables.md
+++ b/docs/configuration/environment-variables.md
@@ -92,7 +92,7 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_DETACH_CONTAINER`       | none                            | `--detach` flag                                                                                                                                  | Whether to detach a container started via `dokku run`. |
 | `DOKKU_QUIET_OUTPUT`           | none                            | `--quiet` flag                                                                                                                                   | Silences certain header output for `dokku` commands. |
 | `DOKKU_RM_CONTAINER`           | none                            | `dokku config:set` <br /> `--rm-container` flag <br /> `--rm` flag                                                                               | Whether to keep `dokku run` containers around or not. |
-| `DOKKU_TRACE`                  | none                            | `dokku trace on`   <br /> `dokku trace false` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
+| `DOKKU_TRACE`                  | none                            | `dokku trace:on`   <br /> `dokku trace:off` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
 | `DOKKU_APP_PROXY_TYPE`         | `nginx`                         | `dokku proxy:set`                                                                                                                                | |
 | `DOKKU_APP_RESTORE`            | `1`                             | `dokku config:set` <br /> `dokku ps:stop`                                                                                                        | |
 | `DOKKU_APP_SHELL`              | `/bin/bash`                     | `dokku config:set`                                                                                                                               | Allows users to change the default shell used by Dokku for `dokku enter` and execution of deployment tasks. |
diff --git a/docs/getting-started/troubleshooting.md b/docs/getting-started/troubleshooting.md
index 627664275..ed8181aad 100644
--- a/docs/getting-started/troubleshooting.md
+++ b/docs/getting-started/troubleshooting.md
@@ -1,5 +1,38 @@
 # Troubleshooting
 
+> New as of 0.17.0
+
+```
+trace:on                                       # Enables trace mode
+trace:off                                      # Disables trace mode
+```
+
+## Trace Mode
+
+By default, Dokku will constrain the amount of output displayed for any given command run. The verbosity of output can be increased by enabling trace mode. Trace mode will turn on the `set -x` flag for bash plugins, while other plugins are free to respect the environment variable `DOKKU_TRACE` and log differently as approprate. Trace mode can be useful to see _where_ plugins are running commands that would otherwise be unexpected.
+
+To enable trace mode, run `trace:on`
+
+```shell
+dokku trace:on
+```
+
+```
+-----> Enabling trace mode
+```
+
+Trace mode can be disabled with `trace:off`
+
+```shell
+dokku trace:off
+```
+
+```
+-----> Disabling trace mode
+```
+
+## Common Problems
+
 __Symptom:__ I deployed my app but I am getting the default nginx page.
 
 __Solution:__
@@ -41,22 +74,7 @@ __Symptom:__ I want to deploy my app, but while pushing I get the following erro
 
 __Solution:__
 
-The `remote rejected` error does not give enough information. Anything could have failed.
-
-To enable Dokku tracing, simply run the following command:
-
-```shell
-# since 0.3.9
-dokku trace on
-```
-
-In versions older than 0.3.9, you can create a `/home/dokku/dokkurc` file containing the following:
-
-```shell
-export DOKKU_TRACE=1
-```
-
-This will trace all of Dokku's activity. If this does not help you, create a [gist](https://gist.github.com) containing the full log, and create an issue.
+The `remote rejected` error does not give enough information. Anything could have failed. Enable trace mode and begin debugging. If this does not help you, create a [gist](https://gist.github.com) containing the full log, and create an issue.
 
 ***
 
diff --git a/plugins/trace/commands b/plugins/trace/commands
new file mode 100755
index 000000000..4e8ffb885
--- /dev/null
+++ b/plugins/trace/commands
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+[[ " help trace:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+source "$PLUGIN_AVAILABLE_PATH/trace/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+case "$1" in
+  help | trace:help)
+    trace_help_cmd "$@"
+    ;;
+
+  *)
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+    ;;
+
+esac
diff --git a/plugins/trace/internal-functions b/plugins/trace/internal-functions
new file mode 100755
index 000000000..c055b7a50
--- /dev/null
+++ b/plugins/trace/internal-functions
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+trace_help_content_func() {
+  declare desc="return trace plugin help content"
+  cat <<help_content
+    trace, [DEPRECATED] Enables/Disables trace mode
+    trace:on, Clones an app
+    trace:off, Create a new app
+help_content
+}
+
+trace_help_cmd() {
+  if [[ $1 == "trace:help" ]]; then
+    echo -e 'Usage: dokku trace[:COMMAND]'
+    echo ''
+    echo 'Manage trace mode'
+    echo ''
+    echo 'Additional commands:'
+    trace_help_content_func | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    trace_help_content_func
+  else
+    cat <<help_desc
+    trace, Manage trace mode
+help_desc
+  fi
+}
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
new file mode 100755
index 000000000..0aded6419
--- /dev/null
+++ b/plugins/trace/plugin.toml
@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core trace plugin"
+version = "0.16.4"
+[plugin.config]
diff --git a/plugins/00_dokku-standard/subcommands/trace b/plugins/trace/subcommands/default
similarity index 67%
rename from plugins/00_dokku-standard/subcommands/trace
rename to plugins/trace/subcommands/default
index 551293831..16c47d81a 100755
--- a/plugins/00_dokku-standard/subcommands/trace
+++ b/plugins/trace/subcommands/default
@@ -3,23 +3,25 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-dokku_trace_cmd() {
-  declare desc="enables/disables DOKKU_TRACE"
+trace_default_cmd() {
+  declare desc="enables/disables trace mode"
   local cmd="trace"
   [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
   [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
     dokku_log_fail "Valid trace options are [on/off]"
   }
 
+  dokku_log_warn "Deprecated: Please use trace:on or trace:off"
+
   if [[ "$2" == "on" ]]; then
-    echo "Enabling dokku trace"
+    dokku_log_info1 "Enabling trace mode"
     echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
   fi
 
   if [[ "$2" == "off" ]]; then
-    echo "Disabling dokku trace"
+    dokku_log_info1 "Disabling trace mode"
     rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
   fi
 }
 
-dokku_trace_cmd "$@"
+trace_default_cmd "$@"
diff --git a/plugins/trace/subcommands/off b/plugins/trace/subcommands/off
new file mode 100755
index 000000000..a7f44c0eb
--- /dev/null
+++ b/plugins/trace/subcommands/off
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+trace_off_cmd() {
+  declare desc="disables trace mode"
+  local cmd="trace"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+
+  dokku_log_info1 "Disabling trace mode"
+  rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+}
+
+trace_off_cmd "$@"
diff --git a/plugins/trace/subcommands/on b/plugins/trace/subcommands/on
new file mode 100755
index 000000000..694791b16
--- /dev/null
+++ b/plugins/trace/subcommands/on
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+trace_on_cmd() {
+  declare desc="enables trace mode"
+  local cmd="trace"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+
+  dokku_log_info1 "Enabling trace mode"
+  echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+}
+
+trace_on_cmd "$@"

From ceac86b58fae50fe4fc55188e1acc05ab05e12d8 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 17 May 2019 11:58:53 -0400
Subject: [PATCH 107/163] fix: correct issue where resource setting was
 overriding pre-existing values

---
 plugins/resource/subcommands.go | 5 +++--
 tests/unit/20_resource.bats     | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go
index e3a8f68b6..b607a4609 100644
--- a/plugins/resource/subcommands.go
+++ b/plugins/resource/subcommands.go
@@ -121,10 +121,11 @@ func setResourceType(appName string, processType string, r Resource, resourceTyp
 	common.LogInfo2Quiet(message)
 
 	for key, value := range resources {
-		if value != "" {
-			common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
+		if value == "" {
+			continue
 		}
 
+		common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
 		property := propertyKey(processType, resourceType, key)
 		err := common.PropertyWrite("resource", appName, property, value)
 		if err != nil {
diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index a8f92cc89..0ee9bef0a 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -116,6 +116,11 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  run /bin/bash -c "dokku resource:reserve --cpu 1.5 --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   dokku ps:rebuild "$TEST_APP"
   CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"

From 2aac9c71fc504760103d76a9403248b91aa284ac Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 17 May 2019 11:59:15 -0400
Subject: [PATCH 108/163] fix: cpu flag becomes cpus for the docker-scheduler

---
 .../docker-args-process-deploy/docker-args-process-deploy.go  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
index 76dec47e6..0b5636a5f 100644
--- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -50,6 +50,10 @@ func main() {
 					continue
 				}
 
+				if parts[1] == "cpu" {
+					parts[1] = "cpus"
+				}
+
 				limits[parts[1]] = value
 			}
 			if parts[0] == "reserve" {

From a92687d3e8f2c7985e8eb559fc30791919906174 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 17 May 2019 12:00:05 -0400
Subject: [PATCH 109/163] fix: correct calls to fetch process-specific build
 and deploy args

---
 docs/development/plugin-triggers.md          | 20 +++++++++++++++++++-
 plugins/app-json/internal-functions          |  2 +-
 plugins/common/functions                     |  4 ++--
 plugins/scheduler-docker-local/scheduler-run |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 11a2c0c63..a7e52baf7 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -311,6 +311,24 @@ verify_app_name "$APP"
 # TODO
 ```
 
+### `docker-args-process-build`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
+- Invoked by: `dokku ps:rebuild`
+- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
 ### `docker-args-process-deploy`
 
 - Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
@@ -333,7 +351,7 @@ verify_app_name "$APP"
 
 - Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker run options.
 - Invoked by: `dokku run`
-- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE [$PROC_TYPE $CONTAINER_INDEX]`
+- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE`
 - Example:
 
 ```shell
diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index 46feb92d1..1d2dc2341 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -85,7 +85,7 @@ execute_script() {
 
   local IMAGE_SOURCE_TYPE="dockerfile"
   is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
-  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE")
 
   # eval args as array to respect escapes
   declare -a ARG_ARRAY
diff --git a/plugins/common/functions b/plugins/common/functions
index 8c3f59296..1aa97ffde 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -535,7 +535,7 @@ dokku_build() {
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
       local IMAGE_SOURCE_TYPE="herokuish"
-      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE")
 
       declare -a ARG_ARRAY
       eval "ARG_ARRAY=($DOCKER_ARGS)"
@@ -563,7 +563,7 @@ dokku_build() {
       [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
       local IMAGE_SOURCE_TYPE="dockerfile"
-      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE")
 
       # strip --volume and -v args from DOCKER_ARGS
       local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index 22a374204..c93fa23b3 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -29,7 +29,7 @@ scheduler-docker-local-scheduler-run() {
 
   local IMAGE_SOURCE_TYPE="dockerfile"
   is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
-  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE")
 
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"

From e71ad53b0e44c8f24f5a7663cf29b4398321c749 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 17 May 2019 12:03:35 -0400
Subject: [PATCH 110/163] tests: check the cpu setting

Switch to 0.5 as its safer to run tests on a single-core VM
---
 tests/unit/20_resource.bats | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index 0ee9bef0a..0fd77dbc9 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -116,7 +116,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku resource:reserve --cpu 1.5 --process-type worker $TEST_APP"
+  run /bin/bash -c "dokku resource:reserve --cpu 0.5 --process-type worker $TEST_APP"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -127,6 +127,10 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_output "536870912"
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.NanoCpus}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "500000000"
 
   run /bin/bash -c "dokku resource:reserve-clear --process-type worker $TEST_APP"
   echo "output: $output"

From 7dd9007607c25f8fa1eddd6255eb30bc39efa42b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 17 May 2019 12:46:23 -0400
Subject: [PATCH 111/163] fix: cpu limiting isn't available on CircleCI

---
 tests/unit/20_resource.bats | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
index 0fd77dbc9..31b2f53e5 100644
--- a/tests/unit/20_resource.bats
+++ b/tests/unit/20_resource.bats
@@ -127,10 +127,10 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_output "536870912"
-  run /bin/bash -c "docker inspect --format '{{.HostConfig.NanoCpus}}' $CID"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output "500000000"
+  # run /bin/bash -c "docker inspect --format '{{.HostConfig.NanoCpus}}' $CID"
+  # echo "output: $output"
+  # echo "status: $status"
+  # assert_output "500000000"
 
   run /bin/bash -c "dokku resource:reserve-clear --process-type worker $TEST_APP"
   echo "output: $output"

From 94c06bbdd2e55afe42aeaec961256a3933b2737c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 18 May 2019 15:03:36 -0700
Subject: [PATCH 112/163] fix: correct issue in proxy:ports-set invocation

---
 plugins/proxy/subcommands/ports-set | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/proxy/subcommands/ports-set b/plugins/proxy/subcommands/ports-set
index 23289c19c..0e8cb487f 100755
--- a/plugins/proxy/subcommands/ports-set
+++ b/plugins/proxy/subcommands/ports-set
@@ -6,13 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 proxy_ports_set_cmd() {
   declare desc="add proxy port mappings from an app"
-  local cmd="proxy:add"
+  local cmd="proxy:set"
   local APP="$2"
   verify_app_name "$APP"
   shift 2
 
   set_proxy_ports "$APP" "$@"
-  plugn trigger post-proxy-ports-update "$APP" "add"
+  plugn trigger post-proxy-ports-update "$APP" "set"
 }
 
 proxy_ports_set_cmd "$@"

From 676aa1a05b3edcd286b1518f83951fe3baa0a393 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 18 May 2019 15:04:16 -0700
Subject: [PATCH 113/163] docs: clarify proxy:ports-* commands

Closes #3550
---
 docs/networking/port-management.md  | 10 +++++-----
 plugins/proxy/internal-functions    |  9 +++++----
 plugins/proxy/subcommands/ports-add |  2 +-
 plugins/proxy/subcommands/ports-set |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/networking/port-management.md b/docs/networking/port-management.md
index 94c07c486..27431dd73 100644
--- a/docs/networking/port-management.md
+++ b/docs/networking/port-management.md
@@ -3,11 +3,11 @@
 > New as of 0.5.0, Enhanced in 0.6.0
 
 ```
-proxy:ports <app>                        # List proxy port mappings for app
-proxy:ports-set <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for app
-proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Add proxy port mappings for app
-proxy:ports-clear <app>                  # Clear all proxy port mappings for app
-proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Unset proxy port mappings for app
+proxy:ports <app>                        # List proxy port mappings for an app
+proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Add proxy port mappings to an app
+proxy:ports-clear <app>                  # Clear all proxy port mappings for an app
+proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Remove specific proxy port mappings from an app
+proxy:ports-set <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for an app
 ```
 
 In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
diff --git a/plugins/proxy/internal-functions b/plugins/proxy/internal-functions
index 073c9aece..70e8dbbd5 100755
--- a/plugins/proxy/internal-functions
+++ b/plugins/proxy/internal-functions
@@ -80,12 +80,13 @@ proxy_help_content_func() {
   declare desc="return proxy plugin help content"
   cat <<help_content
     proxy <app>, [DEPRECATED] Show proxy settings for app
-    proxy:enable <app>, Enable proxy 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-clear <app>, Clear all 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-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...], Unset proxy port mappings for app
+    proxy:ports-add <app> [<scheme>:<host-port>:<container-port>...], Add proxy port mappings to an app
+    proxy:ports-clear <app>, Clear all proxy port mappings for an app
+    proxy:ports-remove <app> [<host-port>|<scheme>:<host-port>:<container-port>...], Remove specific proxy port mappings from an app
+    proxy:ports-set <app> [<scheme>:<host-port>:<container-port>...], Set proxy port mappings for an app
     proxy:report [<app>] [<flag>], Displays a proxy report for one or more apps
     proxy:set <app> <proxy-type>, Set proxy type for app
 help_content
diff --git a/plugins/proxy/subcommands/ports-add b/plugins/proxy/subcommands/ports-add
index 9ed40cbef..973c7b209 100755
--- a/plugins/proxy/subcommands/ports-add
+++ b/plugins/proxy/subcommands/ports-add
@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 proxy_ports_add_cmd() {
-  declare desc="add proxy port mappings from an app"
+  declare desc="add proxy port mappings to an app"
   local cmd="proxy:add"
   local APP="$2"
   verify_app_name "$APP"
diff --git a/plugins/proxy/subcommands/ports-set b/plugins/proxy/subcommands/ports-set
index 0e8cb487f..d550a4fc7 100755
--- a/plugins/proxy/subcommands/ports-set
+++ b/plugins/proxy/subcommands/ports-set
@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 proxy_ports_set_cmd() {
-  declare desc="add proxy port mappings from an app"
+  declare desc="set proxy port mappings for an app"
   local cmd="proxy:set"
   local APP="$2"
   verify_app_name "$APP"

From 4264380e152b685f90cbb13e7a0213e4ed08a0dc Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 18 May 2019 14:41:59 -0700
Subject: [PATCH 114/163] feat: disable scaling if app contains DOKKU_SCALE
 file

A DOKKU_SCALE file will always be used for managing the scale count for an app if it exists in a repository. As such, ps:scale usage should be disabled in those cases. This commit makes that more apparent.

Also document how to build a specific core plugin for testing purposes.

Closes #3544
---
 docs/development/testing.md                   |  3 ++
 plugins/common/functions                      |  5 ++-
 plugins/ps/functions                          | 31 ++++++++++++++++---
 plugins/ps/internal-functions                 |  4 ++-
 tests/apps/dockerfile-dokku-scale/CHECKS      |  5 +++
 tests/apps/dockerfile-dokku-scale/DOKKU_SCALE |  1 +
 tests/apps/dockerfile-dokku-scale/Dockerfile  | 11 +++++++
 tests/apps/dockerfile-dokku-scale/Procfile    |  8 +++++
 .../apps/dockerfile-dokku-scale/check_deploy  |  5 +++
 .../apps/dockerfile-dokku-scale/package.json  | 13 ++++++++
 tests/apps/dockerfile-dokku-scale/web.js      | 12 +++++++
 tests/apps/dockerfile-dokku-scale/worker.js   |  6 ++++
 tests/unit/10_ps-dockerfile.bats              | 29 +++++++++++++++++
 13 files changed, 127 insertions(+), 6 deletions(-)
 create mode 100644 tests/apps/dockerfile-dokku-scale/CHECKS
 create mode 100644 tests/apps/dockerfile-dokku-scale/DOKKU_SCALE
 create mode 100644 tests/apps/dockerfile-dokku-scale/Dockerfile
 create mode 100644 tests/apps/dockerfile-dokku-scale/Procfile
 create mode 100755 tests/apps/dockerfile-dokku-scale/check_deploy
 create mode 100644 tests/apps/dockerfile-dokku-scale/package.json
 create mode 100644 tests/apps/dockerfile-dokku-scale/web.js
 create mode 100644 tests/apps/dockerfile-dokku-scale/worker.js

diff --git a/docs/development/testing.md b/docs/development/testing.md
index 5b4d23c67..90ea77a1a 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -32,6 +32,9 @@ While we do provide official packages for a variety of platforms, as our test su
   # run linter & update vagrant Dokku install from local git clone
   make lint copyfiles
 
+  # build a specific plugin
+  make go-build-plugin copyplugin PLUGIN_NAME=apps
+
   # execute all bats tests
   make unit-tests
 
diff --git a/plugins/common/functions b/plugins/common/functions
index 8c3f59296..8f64ac63b 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -384,7 +384,10 @@ copy_from_image() {
       fi
     fi
     local CID=$(docker create "$DOKKU_GLOBAL_RUN_ARGS" "$IMAGE")
-    docker cp "$CID:$SRC_FILE" "$DST_DIR"
+    if ! docker cp "$CID:$SRC_FILE" "$DST_DIR"; then
+      docker rm -f "$CID" &>/dev/null
+      return 1
+    fi
     docker rm -f "$CID" &>/dev/null
   else
     return 1
diff --git a/plugins/ps/functions b/plugins/ps/functions
index 2a8f0cde4..f2de8ed18 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -62,7 +62,12 @@ generate_scale_file() {
   local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
   verify_app_name "$APP"
 
-  copy_from_image "$IMAGE" "DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || true
+  if copy_from_image "$IMAGE" "DOKKU_SCALE" "$DOKKU_ROOT/$APP" >/dev/null 2>&1; then
+    cp "$DOKKU_SCALE_FILE" "${DOKKU_SCALE_FILE}.extracted"
+  else
+    rm -f "${DOKKU_SCALE_FILE}.extracted"
+  fi
+
   if [[ ! -f $DOKKU_SCALE_FILE ]]; then
     dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."
 
@@ -182,7 +187,7 @@ ps_scale() {
   local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
   shift 1
 
-  [[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG"
+  [[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG" >/dev/null 2>&1
   if [[ -z "$@" ]]; then
     dokku_log_info1_quiet "Scaling for $APP"
     dokku_col_log_msg_quiet "proctype" "qty"
@@ -194,8 +199,12 @@ ps_scale() {
       dokku_col_log_msg "${PROC_NAME}:" "$PROC_COUNT"
     done <"$DOKKU_SCALE_FILE"
   else
-    set_scale "$APP" "$@"
-    release_and_deploy "$APP" "$IMAGE_TAG"
+    if [[ "$(fn-ps-can-scale "$APP")" == "true" ]]; then
+      set_scale "$APP" "$@"
+      release_and_deploy "$APP" "$IMAGE_TAG"
+    else
+      dokku_log_fail "App contains DOKKU_SCALE file and cannot be manually scaled"
+    fi
   fi
 }
 
@@ -241,3 +250,17 @@ fn-ps-is-app-running() {
   APP_STATUS=$(fn-ps-app-status "$APP")
   echo "$APP_STATUS" | cut -d ' ' -f 2
 }
+
+fn-ps-can-scale() {
+  declare APP="$1"
+  local IMAGE_TAG=$(get_running_image_tag "$APP")
+  local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+  local CAN_SCALE=false
+
+  [[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG" >/dev/null 2>&1
+  if [[ ! -f "${DOKKU_SCALE_FILE}.extracted" ]]; then
+    CAN_SCALE=true
+  fi
+
+  echo "$CAN_SCALE"
+}
diff --git a/plugins/ps/internal-functions b/plugins/ps/internal-functions
index cb145acb3..4cab309cb 100755
--- a/plugins/ps/internal-functions
+++ b/plugins/ps/internal-functions
@@ -50,7 +50,8 @@ cmd-ps-report-single() {
 
   if (is_deployed "$APP"); then DEPLOYED="true"; else DEPLOYED="false"; fi
   local passed_phases="deploy"
-  RESTARTPOLICY=$(get_restart_policies "$(get_phase_file_path "$passed_phases")" || true)
+  local RESTARTPOLICY=$(get_restart_policies "$(get_phase_file_path "$passed_phases")" || true)
+  local CAN_SCALE="$(fn-ps-can-scale "$APP")"
 
   local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 2 -n | xargs)"
   local CONTAINER_FILE
@@ -70,6 +71,7 @@ cmd-ps-report-single() {
     "--running: $RUNNING"
     "--restore: $RESTORE"
     "--restart-policy: $RESTARTPOLICY"
+    "--ps-can-scale: $CAN_SCALE"
   )
 
   if [[ -z "$INFO_FLAG" ]]; then
diff --git a/tests/apps/dockerfile-dokku-scale/CHECKS b/tests/apps/dockerfile-dokku-scale/CHECKS
new file mode 100644
index 000000000..068926825
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/CHECKS
@@ -0,0 +1,5 @@
+WAIT=2 # wait 2 seconds
+TIMEOUT=5 # set timeout to 5 seconds
+ATTEMPTS=2 # try 2 times
+
+/ nodejs/express
diff --git a/tests/apps/dockerfile-dokku-scale/DOKKU_SCALE b/tests/apps/dockerfile-dokku-scale/DOKKU_SCALE
new file mode 100644
index 000000000..3cb9829e6
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/DOKKU_SCALE
@@ -0,0 +1 @@
+web=1
diff --git a/tests/apps/dockerfile-dokku-scale/Dockerfile b/tests/apps/dockerfile-dokku-scale/Dockerfile
new file mode 100644
index 000000000..fa82185d5
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:4
+
+EXPOSE 3001/udp
+EXPOSE  3000/tcp
+EXPOSE 3003
+
+COPY . /app
+WORKDIR /app
+RUN npm install
+
+CMD npm start
diff --git a/tests/apps/dockerfile-dokku-scale/Procfile b/tests/apps/dockerfile-dokku-scale/Procfile
new file mode 100644
index 000000000..9c49227a7
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/Procfile
@@ -0,0 +1,8 @@
+###############################
+#         DEVELOPMENT         #
+###############################
+
+# Procfile for development using the new threaded worker (scheduler, twitter stream and delayed job)
+cron: node worker.js
+web: node web.js
+worker: node worker.js
diff --git a/tests/apps/dockerfile-dokku-scale/check_deploy b/tests/apps/dockerfile-dokku-scale/check_deploy
new file mode 100755
index 000000000..e4519b442
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/check_deploy
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+output="$(curl -s -S "$1")"
+echo "$output"
+test "$output" == "nodejs/express"
diff --git a/tests/apps/dockerfile-dokku-scale/package.json b/tests/apps/dockerfile-dokku-scale/package.json
new file mode 100644
index 000000000..397b0ce84
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "2.5.x"
+  },
+  "engines": {
+    "node": "4.2.x"
+  },
+  "scripts": {
+    "start": "false"
+  }
+}
diff --git a/tests/apps/dockerfile-dokku-scale/web.js b/tests/apps/dockerfile-dokku-scale/web.js
new file mode 100644
index 000000000..6b8f4d819
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/web.js
@@ -0,0 +1,12 @@
+var express = require('express');
+
+var app = express.createServer(express.logger());
+
+app.get('/', function(request, response) {
+  response.send('nodejs/express');
+});
+
+var port = process.env.PORT || 5000;
+app.listen(port, function() {
+  console.log("Listening on " + port);
+});
diff --git a/tests/apps/dockerfile-dokku-scale/worker.js b/tests/apps/dockerfile-dokku-scale/worker.js
new file mode 100644
index 000000000..12133530d
--- /dev/null
+++ b/tests/apps/dockerfile-dokku-scale/worker.js
@@ -0,0 +1,6 @@
+function worker() {
+  console.log('sleeping for 60 seconds');
+  setTimeout(worker, 60 * 1000);
+}
+
+worker();
diff --git a/tests/unit/10_ps-dockerfile.bats b/tests/unit/10_ps-dockerfile.bats
index 3101dc6b0..2c0061f08 100644
--- a/tests/unit/10_ps-dockerfile.bats
+++ b/tests/unit/10_ps-dockerfile.bats
@@ -134,6 +134,35 @@ teardown() {
   assert_success
 }
 
+@test "(ps:scale) dockerfile dokku-scale" {
+  run /bin/bash -c "dokku ps:scale $TEST_APP web=2"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  deploy_app dockerfile-dokku-scale
+  CIDS=""
+  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
+    CIDS+=$(< $CID_FILE)
+    CIDS+=" "
+  done
+  CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
+  run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:scale $TEST_APP web=1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku ps:report $TEST_APP --ps-can-scale"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "false"
+}
+
 @test "(ps) dockerfile with procfile" {
   deploy_app dockerfile-procfile
   run /bin/bash -c "dokku ps:stop $TEST_APP"

From 980ffab6000821646b2a2a504dbcb830d92ff383 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 12:58:08 -0700
Subject: [PATCH 115/163] fix: properly split strings in sanitized ps:inspect

Closes #3551
---
 plugins/scheduler-docker-local/scheduler-inspect | 2 +-
 tests/unit/10_ps-general.bats                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect
index 86c26b0b3..77916e379 100755
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -34,7 +34,7 @@ for container in data:
             env.append(e)
             continue
 
-        k, v = e.split('=', 2)
+        k, v = e.split('=', 1)
         env.append('{0}=XXXXXX'.format(k))
 
     container['Config']['Env'] = env
diff --git a/tests/unit/10_ps-general.bats b/tests/unit/10_ps-general.bats
index 737120cce..fe585de35 100644
--- a/tests/unit/10_ps-general.bats
+++ b/tests/unit/10_ps-general.bats
@@ -13,6 +13,7 @@ teardown() {
 }
 
 @test "(ps) ps:inspect" {
+  dokku config:set "$TEST_APP" key=value key=value=value
   deploy_app dockerfile
 
   CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)

From f977edabb2c0cc325d59da2a5a8f22dadcba69ab Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 13:25:04 -0700
Subject: [PATCH 116/163] feat: add config:clear command

Closes #3537
---
 docs/configuration/environment-variables.md   |  7 +++---
 plugins/config/config.go                      | 23 +++++++++++++++++++
 plugins/config/config_test.go                 | 16 +++++++++++++
 plugins/config/functions                      |  5 ++++
 plugins/config/src/commands/commands.go       |  1 +
 plugins/config/src/subcommands/clear/clear.go | 17 ++++++++++++++
 plugins/config/subcommands.go                 |  9 ++++++++
 7 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 plugins/config/src/subcommands/clear/clear.go

diff --git a/docs/configuration/environment-variables.md b/docs/configuration/environment-variables.md
index c6a5cfda6..d0c7c7c7c 100644
--- a/docs/configuration/environment-variables.md
+++ b/docs/configuration/environment-variables.md
@@ -6,12 +6,13 @@ The `config` plugin provides the following commands to manage your variables:
 
 ```
 config (<app>|--global)                                                               Pretty-print an app or global environment
+config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
+config:clear (<app>|--global)                                                         Clears environment variables
+config:export (<app>|--global) [--envfile]                                            Export a global or app environment
 config:get (<app>|--global) KEY                                                       Display a global or app-specific config value
+config:keys (<app>|--global) [--merged]                                               Show keys set in environment
 config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
 config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...]                          Unset one or more config vars
-config:export (<app>|--global) [--envfile]                                            Export a global or app environment
-config:keys (<app>|--global) [--merged]                                               Show keys set in environment
-config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
 ```
 > For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
 
diff --git a/plugins/config/config.go b/plugins/config/config.go
index 23a74943a..4947492f3 100644
--- a/plugins/config/config.go
+++ b/plugins/config/config.go
@@ -92,6 +92,29 @@ func UnsetMany(appName string, keys []string, restart bool) (err error) {
 	return
 }
 
+//UnsetAll removes all config keys
+func UnsetAll(appName string, restart bool) (err error) {
+	global := appName == ""
+	env, err := loadAppOrGlobalEnv(appName)
+	if err != nil {
+		return
+	}
+	var changed = false
+	for k := range env.Map() {
+		common.LogInfo1Quiet(fmt.Sprintf("Unsetting %s", k))
+		env.Unset(k)
+		changed = true
+	}
+	if changed {
+		env.Write()
+		triggerUpdate(appName, "clear", []string{})
+	}
+	if !global && restart && env.GetBoolDefault("DOKKU_APP_RESTORE", true) {
+		triggerRestart(appName)
+	}
+	return
+}
+
 func triggerRestart(appName string) {
 	common.LogInfo1(fmt.Sprintf("Restarting app %s", appName))
 	if err := common.PlugnTrigger("app-restart", appName); err != nil {
diff --git a/plugins/config/config_test.go b/plugins/config/config_test.go
index 05f42faad..ff2502fd2 100644
--- a/plugins/config/config_test.go
+++ b/plugins/config/config_test.go
@@ -80,6 +80,22 @@ func TestConfigSetMany(t *testing.T) {
 	Expect(SetMany(testAppName+"does_not_exist", vals, false)).ToNot(Succeed())
 }
 
+func TestConfigUnsetAll(t *testing.T) {
+	RegisterTestingT(t)
+	Expect(setupTestApp()).To(Succeed())
+	defer teardownTestApp()
+
+	expectValue(testAppName, "testKey", "TESTING")
+	expectValue("", "testKey", "GLOBAL_TESTING")
+
+	Expect(UnsetAll(testAppName, false)).To(Succeed())
+	expectNoValue(testAppName, "testKey")
+	expectNoValue(testAppName, "noKey")
+	expectNoValue(testAppName, "globalKey")
+
+	Expect(UnsetAll(testAppName+"does-not-exist", false)).ToNot(Succeed())
+}
+
 func TestConfigUnsetMany(t *testing.T) {
 	RegisterTestingT(t)
 	Expect(setupTestApp()).To(Succeed())
diff --git a/plugins/config/functions b/plugins/config/functions
index 70688b7d7..7c260a2d9 100755
--- a/plugins/config/functions
+++ b/plugins/config/functions
@@ -46,6 +46,11 @@ config_get() {
   config_sub get "$@"
 }
 
+config_clear() {
+  declare desc="clears config vars"
+  config_sub clear "$@"
+}
+
 config_set() {
   declare desc="set value of given config var"
   config_sub set "$@"
diff --git a/plugins/config/src/commands/commands.go b/plugins/config/src/commands/commands.go
index 5ce6f8906..766be2960 100644
--- a/plugins/config/src/commands/commands.go
+++ b/plugins/config/src/commands/commands.go
@@ -22,6 +22,7 @@ Additional commands:`
 	helpContent = `
     config (<app>|--global), Pretty-print an app or global environment
     config:bundle (<app>|--global) [--merged], Bundle environment into tarfile
+    config:clear (<app>|--global), Clears environment variables
     config:export (<app>|--global) [--envfile], Export a global or app environment
     config:get (<app>|--global) KEY, Display a global or app-specific config value
     config:keys (<app>|--global) [--merged], Show keys set in environment
diff --git a/plugins/config/src/subcommands/clear/clear.go b/plugins/config/src/subcommands/clear/clear.go
new file mode 100644
index 000000000..8fe985330
--- /dev/null
+++ b/plugins/config/src/subcommands/clear/clear.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/dokku/dokku/plugins/config"
+)
+
+//clear all entries from the given environment
+func main() {
+	args := flag.NewFlagSet("config:clear", flag.ExitOnError)
+	global := args.Bool("global", false, "--global: use the global environment")
+	noRestart := args.Bool("no-restart", false, "--no-restart: no restart")
+	args.Parse(os.Args[2:])
+	config.CommandClear(args.Args(), *global, *noRestart)
+}
diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go
index c2cc061bb..0ae759be2 100644
--- a/plugins/config/subcommands.go
+++ b/plugins/config/subcommands.go
@@ -50,6 +50,15 @@ func CommandGet(args []string, global bool, quoted bool) {
 	}
 }
 
+//CommandClear implements config:clear
+func CommandClear(args []string, global bool, noRestart bool) {
+	appName, _ := getCommonArgs(global, args)
+	err := UnsetAll(appName, !noRestart)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}
+
 //CommandUnset implements config:unset
 func CommandUnset(args []string, global bool, noRestart bool) {
 	appName, keys := getCommonArgs(global, args)

From da4361583b3fe3128e5572e7cb463ab65b0c1961 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 17:56:50 -0700
Subject: [PATCH 117/163] fix: reverse quotes for variable expansion

Without reversing quotes, the variables are sometimes improperly expanded, resulting in files not being removed.
---
 plugins/app-json/internal-functions              | 4 ++--
 plugins/certs/subcommands/add                    | 2 +-
 plugins/certs/subcommands/generate               | 2 +-
 plugins/git/functions                            | 2 +-
 plugins/nginx-vhosts/functions                   | 2 +-
 plugins/nginx-vhosts/internal-functions          | 2 +-
 plugins/ps/functions                             | 4 ++--
 plugins/scheduler-docker-local/check-deploy      | 2 +-
 plugins/scheduler-docker-local/scheduler-inspect | 2 +-
 plugins/ssh-keys/functions                       | 2 +-
 plugins/ssh-keys/subcommands/add                 | 2 +-
 plugins/tar/functions                            | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index 1d2dc2341..dbb723b9b 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -10,7 +10,7 @@ get_phase_script() {
   declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2"
   local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_get_phase_script.XXXX")
   local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json"
-  trap 'rm -rf "$GET_PHASE_SCRIPT_TMP_WORK_DIR" >/dev/null' RETURN INT TERM
+  trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM
 
   copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true
 
@@ -26,7 +26,7 @@ get_release_cmd() {
   declare APP="$1" IMAGE_TAG="$2"
 
   extract_procfile "$APP" "$IMAGE_TAG" >/dev/null
-  trap 'remove_procfile $APP' RETURN INT TERM EXIT
+  trap "remove_procfile $APP" RETURN INT TERM EXIT
 
   get_cmd_from_procfile "$APP" "release" "5000"
 }
diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add
index a40c2d8f4..cb24c69cc 100755
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -44,7 +44,7 @@ certs_set() {
   elif is_tar_import; then
     local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX")
     pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null
-    trap 'popd &>/dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR >/dev/null' RETURN
+    trap "popd &>/dev/null || true; rm -rf '$CERTS_SET_TMP_WORK_DIR' >/dev/null" RETURN
     tar xvf - <&0
 
     local CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f | grep ".crt$")
diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate
index 984e74518..a35ef408f 100755
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -15,7 +15,7 @@ certs_generate_cmd() {
   if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then
     local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs.XXXXXXXXX")
     pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null
-    trap 'popd &>/dev/null || true; rm -rf "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null' INT TERM EXIT
+    trap "popd &>/dev/null || true; rm -rf '$CERTS_GENERATE_TMP_WORK_DIR' >/dev/null" INT TERM EXIT
 
     openssl genrsa -out server.key 2048
     openssl req -new -key server.key -out server.csr
diff --git a/plugins/git/functions b/plugins/git/functions
index 922f2d4ea..b46971030 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -32,7 +32,7 @@ git_build_app_repo() {
 
   # clean up after ourselves
   local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_git.XXXX")
-  trap 'rm -rf "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
   local TMP_TAG="dokku/$REV"
   chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR"
diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions
index 7d3a15ea7..0c41d6093 100755
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -304,7 +304,7 @@ nginx_build_config() {
     local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX")
     local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME"
     # shellcheck disable=SC2086
-    trap 'rm -rf $NGINX_CONF $NGINX_BUILD_CONFIG_TMP_WORK_DIR >/dev/null' RETURN INT TERM EXIT
+    trap "rm -rf '$NGINX_CONF' '$NGINX_BUILD_CONFIG_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
     get_custom_nginx_template "$APP" "$CUSTOM_NGINX_TEMPLATE" 2>/dev/null
     if [[ -f "$CUSTOM_NGINX_TEMPLATE" ]]; then
diff --git a/plugins/nginx-vhosts/internal-functions b/plugins/nginx-vhosts/internal-functions
index 2b413c1c3..ff4fa6e1a 100755
--- a/plugins/nginx-vhosts/internal-functions
+++ b/plugins/nginx-vhosts/internal-functions
@@ -28,7 +28,7 @@ nginx_vhosts_is_valid_nginx_config_func() {
   declare APP="$1"
   local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil"
   local TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_OUTPUT" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TMP_OUTPUT' >/dev/null" RETURN INT TERM EXIT
 
   sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT"
   sudo "$NGINX_LOCATION" -t -c "$TMP_OUTPUT" 2>/dev/null
diff --git a/plugins/ps/functions b/plugins/ps/functions
index f2de8ed18..b7f4dacb3 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -72,7 +72,7 @@ generate_scale_file() {
     dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."
 
     local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_scale.XXXX")
-    trap 'rm -rf "$GENERATE_SCALE_FILE_TMP_WORK_DIR" >/dev/null' RETURN
+    trap "rm -rf '$GENERATE_SCALE_FILE_TMP_WORK_DIR' >/dev/null" RETURN
 
     if [[ -f $DOKKU_PROCFILE ]]; then
       while read -r line || [[ -n "$line" ]]; do
@@ -99,7 +99,7 @@ set_scale() {
   shift 1
 
   extract_procfile "$APP" "$IMAGE_TAG" >/dev/null
-  trap 'remove_procfile $APP' RETURN INT TERM EXIT
+  trap "remove_procfile $APP" RETURN INT TERM EXIT
 
   local SCALE_SETTINGS=("$@")
   for procscale in "${SCALE_SETTINGS[@]}"; do
diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy
index ba136186e..41cb4fe10 100755
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -99,7 +99,7 @@ scheduler-docker-local-check-deploy() {
       dokku_log_info2_quiet "end $APP $DOKKU_APP_CONTAINER_TYPE container output"
     fi
   }
-  trap 'checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID' RETURN INT TERM EXIT
+  trap "checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID" RETURN INT TERM EXIT
 
   if [[ ! -s "${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]]; then
     # We allow custom check for web instances only
diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect
index 77916e379..4bfa05c13 100755
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -14,7 +14,7 @@ scheduler-docker-local-scheduler-inspect() {
   fi
 
   local TMP_INSPECT_CMD=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_INSPECT_CMD" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TMP_INSPECT_CMD' >/dev/null" RETURN INT TERM EXIT
   cat >"$TMP_INSPECT_CMD" <<EOF
 import json
 import sys
diff --git a/plugins/ssh-keys/functions b/plugins/ssh-keys/functions
index 8e4560fa7..5ece2f227 100755
--- a/plugins/ssh-keys/functions
+++ b/plugins/ssh-keys/functions
@@ -16,7 +16,7 @@ verify_ssh_key_file() {
   local key line=0
   local TMP_KEY_FILE
   TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_KEY_FILE" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT
 
   while read -r key; do
     line=$((line + 1))
diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index 89242b8c3..b533a611c 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -11,7 +11,7 @@ add_keys() {
   declare NAME="$1" KEY_FILE="$2"
   local TMP_KEY_FILE
   TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_KEY_FILE" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT
 
   if [[ -n "$KEY_FILE" ]]; then
     true
diff --git a/plugins/tar/functions b/plugins/tar/functions
index d2c5e6624..a38f46633 100755
--- a/plugins/tar/functions
+++ b/plugins/tar/functions
@@ -12,7 +12,7 @@ tar_build() {
 
   # clean up after ourselves
   local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_tar.XXXX")
-  trap 'rm -rf "$TAR_BUILD_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TAR_BUILD_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
   # extract tar file
   chmod 755 "$TAR_BUILD_TMP_WORK_DIR"

From c8a491ed7f8712d10be8335bcb24888fca462fcf Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 17:57:13 -0700
Subject: [PATCH 118/163] fix: only use the RETURN signal for the suppress file
 removal

Closes #3473
---
 plugins/common/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index ae16049dc..94e167534 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -1080,7 +1080,7 @@ suppress_output() {
   declare desc="suppress all output from a given command unless there is an error"
   local TMP_COMMAND_OUTPUT
   TMP_COMMAND_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_COMMAND_OUTPUT" >/dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$TMP_COMMAND_OUTPUT' >/dev/null" RETURN
 
   "$@" >"$TMP_COMMAND_OUTPUT" 2>&1 || {
     local exit_code="$?"

From 1b92f4a97e3b22118b49c4d6b8456c2fb8cc4d9a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 18:00:14 -0700
Subject: [PATCH 119/163] chore: standardize how temporary files are named

---
 plugins/app-json/internal-functions              | 2 +-
 plugins/certs/subcommands/add                    | 2 +-
 plugins/certs/subcommands/generate               | 2 +-
 plugins/common/functions                         | 2 +-
 plugins/git/functions                            | 2 +-
 plugins/nginx-vhosts/functions                   | 4 ++--
 plugins/nginx-vhosts/internal-functions          | 2 +-
 plugins/ps/functions                             | 2 +-
 plugins/scheduler-docker-local/check-deploy      | 2 +-
 plugins/scheduler-docker-local/scheduler-inspect | 2 +-
 plugins/ssh-keys/functions                       | 2 +-
 plugins/ssh-keys/subcommands/add                 | 2 +-
 plugins/tar/functions                            | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index dbb723b9b..72cee342c 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -8,7 +8,7 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 get_phase_script() {
   declare desc="extracts app.json from app image and returns the appropriate json key/value"
   declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2"
-  local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_get_phase_script.XXXX")
+  local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json"
   trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM
 
diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add
index cb24c69cc..03f43f950 100755
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -42,7 +42,7 @@ certs_set() {
     # importing from file
     true
   elif is_tar_import; then
-    local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX")
+    local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
     pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null
     trap "popd &>/dev/null || true; rm -rf '$CERTS_SET_TMP_WORK_DIR' >/dev/null" RETURN
     tar xvf - <&0
diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate
index a35ef408f..7456481b1 100755
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -13,7 +13,7 @@ certs_generate_cmd() {
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then
-    local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs.XXXXXXXXX")
+    local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
     pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null
     trap "popd &>/dev/null || true; rm -rf '$CERTS_GENERATE_TMP_WORK_DIR' >/dev/null" INT TERM EXIT
 
diff --git a/plugins/common/functions b/plugins/common/functions
index 94e167534..08d921071 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -1079,7 +1079,7 @@ release_advisory_lock() {
 suppress_output() {
   declare desc="suppress all output from a given command unless there is an error"
   local TMP_COMMAND_OUTPUT
-  TMP_COMMAND_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  TMP_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TMP_COMMAND_OUTPUT' >/dev/null" RETURN
 
   "$@" >"$TMP_COMMAND_OUTPUT" 2>&1 || {
diff --git a/plugins/git/functions b/plugins/git/functions
index b46971030..163e0f1bc 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -31,7 +31,7 @@ git_build_app_repo() {
   verify_app_name "$APP"
 
   # clean up after ourselves
-  local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_git.XXXX")
+  local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
   local TMP_TAG="dokku/$REV"
diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions
index 0c41d6093..6de04743f 100755
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -300,8 +300,8 @@ nginx_build_config() {
     done
     local PROXY_UPSTREAM_PORTS="$(echo "$PROXY_UPSTREAM_PORTS" | xargs)"
 
-    local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d /tmp/dokku_nginx_template.XXXXX)
-    local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX")
+    local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+    local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXX")
     local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME"
     # shellcheck disable=SC2086
     trap "rm -rf '$NGINX_CONF' '$NGINX_BUILD_CONFIG_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
diff --git a/plugins/nginx-vhosts/internal-functions b/plugins/nginx-vhosts/internal-functions
index ff4fa6e1a..587a2722f 100755
--- a/plugins/nginx-vhosts/internal-functions
+++ b/plugins/nginx-vhosts/internal-functions
@@ -27,7 +27,7 @@ nginx_vhosts_is_valid_nginx_config_func() {
   declare desc="checks if an app has a valid nginx config"
   declare APP="$1"
   local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil"
-  local TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  local TMP_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TMP_OUTPUT' >/dev/null" RETURN INT TERM EXIT
 
   sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT"
diff --git a/plugins/ps/functions b/plugins/ps/functions
index b7f4dacb3..627c2343c 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -71,7 +71,7 @@ generate_scale_file() {
   if [[ ! -f $DOKKU_SCALE_FILE ]]; then
     dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."
 
-    local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_scale.XXXX")
+    local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
     trap "rm -rf '$GENERATE_SCALE_FILE_TMP_WORK_DIR' >/dev/null" RETURN
 
     if [[ -f $DOKKU_PROCFILE ]]; then
diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy
index 41cb4fe10..721d9c0e6 100755
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -84,7 +84,7 @@ scheduler-docker-local-check-deploy() {
   # docker cp exits with status 1 when run as non-root user when it tries to chown the file
   # after successfully copying the file. Thus, we suppress stderr.
   # ref: https://github.com/dotcloud/docker/issues/3986
-  local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d /tmp/dokku_CHECKS.XXXXX)
+  local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   docker cp "$DOKKU_APP_CONTAINER_ID:/app/CHECKS" "$CHECK_DEPLOY_TMP_WORK_DIR" 2>/dev/null || true
 
   local FILENAME=${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS
diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect
index 4bfa05c13..1a4eb6719 100755
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -13,7 +13,7 @@ scheduler-docker-local-scheduler-inspect() {
     return
   fi
 
-  local TMP_INSPECT_CMD=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  local TMP_INSPECT_CMD=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TMP_INSPECT_CMD' >/dev/null" RETURN INT TERM EXIT
   cat >"$TMP_INSPECT_CMD" <<EOF
 import json
diff --git a/plugins/ssh-keys/functions b/plugins/ssh-keys/functions
index 5ece2f227..7368a2749 100755
--- a/plugins/ssh-keys/functions
+++ b/plugins/ssh-keys/functions
@@ -15,7 +15,7 @@ verify_ssh_key_file() {
   [[ -s ${DOKKU_ROOT}/.ssh/authorized_keys ]] || dokku_log_fail "No public keys found."
   local key line=0
   local TMP_KEY_FILE
-  TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT
 
   while read -r key; do
diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index b533a611c..dd3ba7afc 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -10,7 +10,7 @@ add_keys() {
   [[ "$1" == "$cmd" ]] && shift 1
   declare NAME="$1" KEY_FILE="$2"
   local TMP_KEY_FILE
-  TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT
 
   if [[ -n "$KEY_FILE" ]]; then
diff --git a/plugins/tar/functions b/plugins/tar/functions
index a38f46633..c399ecc52 100755
--- a/plugins/tar/functions
+++ b/plugins/tar/functions
@@ -11,7 +11,7 @@ tar_build() {
   shift 1
 
   # clean up after ourselves
-  local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_tar.XXXX")
+  local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
   trap "rm -rf '$TAR_BUILD_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
   # extract tar file

From b921aed073888e1fcc869aa0705481a9ea18068c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 18:29:31 -0700
Subject: [PATCH 120/163] feat: allow users to specify wildcard domains

Closes #3075
---
 plugins/domains/functions  | 2 +-
 tests/unit/20_domains.bats | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/functions b/plugins/domains/functions
index 7b36473ef..3467b30b2 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -312,7 +312,7 @@ is_global_vhost_enabled() {
 is_valid_hostname() {
   declare desc="return 0 if argument is a valid hostname; else return 1"
   local hostname_string="${1,,}"
-  local hostname_regex='^([a-z0-9\*-]+\.)*[a-z0-9\*-]+$'
+  local hostname_regex='^([a-z0-9\.\*-]+\.)*[a-z0-9\*-]+$'
   if [[ $hostname_string =~ $hostname_regex ]]; then
     return 0
   else
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 5aa104750..f23aac2b1 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -45,6 +45,11 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  run /bin/bash -c "dokku domains:add $TEST_APP .dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
   echo "output: $output"
   echo "status: $status"

From 48752a762c739a5fc3bd6bdf619211aaf9bca229 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 May 2019 22:23:13 -0700
Subject: [PATCH 121/163] Release 0.17.0

# History

## 0.17.0

Install/update via the bootstrap script:

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

### Bug Fixes

- #3565: @josegonzalez Properly cleanup temp files
- #3563: @josegonzalez Properly split strings in sanitized ps:inspect
- #3560: @josegonzalez Resource setting fixes
- #3556: @josegonzalez Add missing domains:clear-global command
- #3554: @znz Switch from rawgit to jsdelivr in manifest.json too

### New Features

- #3566: @josegonzalez Allow users to specify wildcard domains
- #3564: @josegonzalez Add config:clear command
- #3477: @alexquick Allow specifying environment variables for dokku run
- #3540: @josegonzalez Do not append the global domain for matching subdomains
- #3559: @josegonzalez Add trace:on and trace:off
- #3561: @josegonzalez feat: disable scaling if app contains DOKKU_SCALE file
- #3558: @josegonzalez Add nginx:show-conf command
- #3549: @josegonzalez Add message indicating that the user is looking at default limits/reservations

### Documentation

- #3557: @josegonzalez Standardize on node-js-app in examples
- #3548: @josegonzalez Remove outdated global resource setting

### Other

- #3562: @josegonzalez Proxy ports manipulation updates
---
 HISTORY.md                                 | 37 ++++++++++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  3 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 150 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index f3a5d875f..34e8dae05 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,42 @@
 # History
 
+## 0.17.0
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh
+sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3565: @josegonzalez Properly cleanup temp files
+- #3563: @josegonzalez Properly split strings in sanitized ps:inspect
+- #3560: @josegonzalez Resource setting fixes
+- #3556: @josegonzalez Add missing domains:clear-global command
+- #3554: @znz Switch from rawgit to jsdelivr in manifest.json too
+
+### New Features
+
+- #3566: @josegonzalez Allow users to specify wildcard domains
+- #3564: @josegonzalez Add config:clear command
+- #3477: @alexquick Allow specifying environment variables for dokku run
+- #3540: @josegonzalez Do not append the global domain for matching subdomains
+- #3559: @josegonzalez Add trace:on and trace:off
+- #3561: @josegonzalez feat: disable scaling if app contains DOKKU_SCALE file
+- #3558: @josegonzalez Add nginx:show-conf command
+- #3549: @josegonzalez Add message indicating that the user is looking at default limits/reservations
+
+### Documentation
+
+- #3557: @josegonzalez Standardize on node-js-app in examples
+- #3548: @josegonzalez Remove outdated global resource setting
+
+### Other
+
+- #3562: @josegonzalez Proxy ports manipulation updates
+
 ## 0.16.4
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 6597079ca..140a633bb 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh
-sudo DOKKU_TAG=v0.16.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh
+sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index ab5cc4be2..3b21b0f8a 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.16.4'
+VERSION = 'v0.17.0'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index bb942b760..86fc46190 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.16.4
+Version: 0.17.0
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 7850baa78..4f6db3b56 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.16.4 enabled    dokku core standard plugin
-  20_events            0.16.4 enabled    dokku core events logging plugin
-  apps                 0.16.4 enabled    dokku core apps plugin
-  build-env            0.16.4 enabled    dokku core build-env plugin
-  certs                0.16.4 enabled    dokku core certificate management plugin
-  checks               0.16.4 enabled    dokku core checks plugin
-  common               0.16.4 enabled    dokku core common plugin
-  config               0.16.4 enabled    dokku core config plugin
-  docker-options       0.16.4 enabled    dokku core docker-options plugin
-  domains              0.16.4 enabled    dokku core domains plugin
-  enter                0.16.4 enabled    dokku core enter plugin
-  git                  0.16.4 enabled    dokku core git plugin
-  logs                 0.16.4 enabled    dokku core logs plugin
-  named-containers     0.16.4 enabled    dokku core named containers plugin
-  network              0.16.4 enabled    dokku core network plugin
-  nginx-vhosts         0.16.4 enabled    dokku core nginx-vhosts plugin
-  plugin               0.16.4 enabled    dokku core plugin plugin
-  proxy                0.16.4 enabled    dokku core proxy plugin
-  ps                   0.16.4 enabled    dokku core ps plugin
-  repo                 0.16.4 enabled    dokku core repo plugin
-  shell                0.16.4 enabled    dokku core shell plugin
-  ssh-keys             0.16.4 enabled    dokku core ssh-keys plugin
-  storage              0.16.4 enabled    dokku core storage plugin
-  tags                 0.16.4 enabled    dokku core tags plugin
-  tar                  0.16.4 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.0 enabled    dokku core standard plugin
+  20_events            0.17.0 enabled    dokku core events logging plugin
+  apps                 0.17.0 enabled    dokku core apps plugin
+  build-env            0.17.0 enabled    dokku core build-env plugin
+  certs                0.17.0 enabled    dokku core certificate management plugin
+  checks               0.17.0 enabled    dokku core checks plugin
+  common               0.17.0 enabled    dokku core common plugin
+  config               0.17.0 enabled    dokku core config plugin
+  docker-options       0.17.0 enabled    dokku core docker-options plugin
+  domains              0.17.0 enabled    dokku core domains plugin
+  enter                0.17.0 enabled    dokku core enter plugin
+  git                  0.17.0 enabled    dokku core git plugin
+  logs                 0.17.0 enabled    dokku core logs plugin
+  named-containers     0.17.0 enabled    dokku core named containers plugin
+  network              0.17.0 enabled    dokku core network plugin
+  nginx-vhosts         0.17.0 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.0 enabled    dokku core plugin plugin
+  proxy                0.17.0 enabled    dokku core proxy plugin
+  ps                   0.17.0 enabled    dokku core ps plugin
+  repo                 0.17.0 enabled    dokku core repo plugin
+  shell                0.17.0 enabled    dokku core shell plugin
+  ssh-keys             0.17.0 enabled    dokku core ssh-keys plugin
+  storage              0.17.0 enabled    dokku core storage plugin
+  tags                 0.17.0 enabled    dokku core tags plugin
+  tar                  0.17.0 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 459faef80..5fab84083 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 95d504505..490de1870 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.16.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index a5e7166f5..8c2472a02 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index f0af9e36a..5dca8d055 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -13,6 +13,7 @@
     "0.13.4",
     "0.14.6",
     "0.15.5",
-    "0.16.4"
+    "0.16.4",
+    "0.17.0"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 66aafc25c..e3ca39d28 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.16.4-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.0-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index a93b60f95..36b6ac040 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh;
-sudo DOKKU_TAG=v0.16.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 1834dfeae..ca53f0ac3 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.16.4/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.16.4 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index b7e37790f..112b193b9 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.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.16.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.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.16.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index b8fd33853..c605f715c 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index f6325b060..bb60d9641 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index c47a642af..638d07cb9 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index f02356bfb..3d0256a08 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 70bff0c83..fa04f44b5 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index ea39365c8..6918505bd 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 7f70f2dd8..d3f84eaba 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index b0733c267..6ba7188a0 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 462d2b5e0..f2ea6c2f4 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index afb412335..edeacfc2e 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 055c580c5..8b1f360d5 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index b86a7f58d..d00e968e0 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index ed84e2499..65edbd188 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 6dad4ba3c..2bd83558d 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 756dda4a8..56e4da7c4 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 3f80df571..863769d17 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 360671cac..6e76be3e8 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 9c8a0634f..d598985a8 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index e470a03a7..f9eef3eca 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index db205128e..432af86c3 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index fbd2aae74..fba4bcf89 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 20922545e..7c49930b2 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index b561c5a73..70ce95c54 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index caf750412..fd00e55f8 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 01b425ea8..f926a9fc4 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 641ee7837..2a37125fe 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 2cbd5d99d..b17925337 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 1d16ea7ae..ec7068d10 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 0aded6419..657190192 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.16.4"
+version = "0.17.0"
 [plugin.config]

From eb8347bcc103ac1fe2f8f5332a71cf39bb1053ff Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 21 May 2019 11:02:24 -0400
Subject: [PATCH 122/163] fix: ignore SC2064

Late expansion was causing issues with variables not actually making it into the trap call, resulting in poor cleaning up temp files.
---
 tests/shellcheck-exclude | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/shellcheck-exclude b/tests/shellcheck-exclude
index 57f97bf7d..57fc5acee 100644
--- a/tests/shellcheck-exclude
+++ b/tests/shellcheck-exclude
@@ -6,6 +6,7 @@
 # SC2029 - Note that, unescaped, this expands on the client side - https://github.com/koalaman/shellcheck/wiki/SC2029
 # SC2034 - VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034
 # SC2046 - Quote this to prevent word splitting - https://github.com/koalaman/shellcheck/wiki/SC2046
+# SC2064 - Use single quotes, otherwise this expands now rather than when signalled.
 # SC2068 - Double quote array expansions to avoid re-splitting elements - https://github.com/koalaman/shellcheck/wiki/SC2068
 # SC2086 - Double quote to prevent globbing and word splitting - https://github.com/koalaman/shellcheck/wiki/SC2086
 # SC2119 - Use 'function "$@"' if function's $1 should mean script's $1 - https://github.com/koalaman/shellcheck/wiki/SC2119

From f80788147c9ac6102170b323646c4f9bc56d0b8c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 21 May 2019 14:42:45 -0400
Subject: [PATCH 123/163] Release 0.17.1

# History

## 0.17.1

Install/update via the bootstrap script:

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

### Bug Fixes

- #3567: @josegonzalez Ignore SC2064
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 34e8dae05..858b20e89 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.17.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh
+sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3567: @josegonzalez Ignore SC2064
+
 ## 0.17.0
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 140a633bb..bb3d9c3fb 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh
-sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh
+sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 3b21b0f8a..d2829fe4c 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.0'
+VERSION = 'v0.17.1'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 86fc46190..d3cd42118 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.0
+Version: 0.17.1
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 4f6db3b56..e1d4280e4 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.0 enabled    dokku core standard plugin
-  20_events            0.17.0 enabled    dokku core events logging plugin
-  apps                 0.17.0 enabled    dokku core apps plugin
-  build-env            0.17.0 enabled    dokku core build-env plugin
-  certs                0.17.0 enabled    dokku core certificate management plugin
-  checks               0.17.0 enabled    dokku core checks plugin
-  common               0.17.0 enabled    dokku core common plugin
-  config               0.17.0 enabled    dokku core config plugin
-  docker-options       0.17.0 enabled    dokku core docker-options plugin
-  domains              0.17.0 enabled    dokku core domains plugin
-  enter                0.17.0 enabled    dokku core enter plugin
-  git                  0.17.0 enabled    dokku core git plugin
-  logs                 0.17.0 enabled    dokku core logs plugin
-  named-containers     0.17.0 enabled    dokku core named containers plugin
-  network              0.17.0 enabled    dokku core network plugin
-  nginx-vhosts         0.17.0 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.0 enabled    dokku core plugin plugin
-  proxy                0.17.0 enabled    dokku core proxy plugin
-  ps                   0.17.0 enabled    dokku core ps plugin
-  repo                 0.17.0 enabled    dokku core repo plugin
-  shell                0.17.0 enabled    dokku core shell plugin
-  ssh-keys             0.17.0 enabled    dokku core ssh-keys plugin
-  storage              0.17.0 enabled    dokku core storage plugin
-  tags                 0.17.0 enabled    dokku core tags plugin
-  tar                  0.17.0 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.1 enabled    dokku core standard plugin
+  20_events            0.17.1 enabled    dokku core events logging plugin
+  apps                 0.17.1 enabled    dokku core apps plugin
+  build-env            0.17.1 enabled    dokku core build-env plugin
+  certs                0.17.1 enabled    dokku core certificate management plugin
+  checks               0.17.1 enabled    dokku core checks plugin
+  common               0.17.1 enabled    dokku core common plugin
+  config               0.17.1 enabled    dokku core config plugin
+  docker-options       0.17.1 enabled    dokku core docker-options plugin
+  domains              0.17.1 enabled    dokku core domains plugin
+  enter                0.17.1 enabled    dokku core enter plugin
+  git                  0.17.1 enabled    dokku core git plugin
+  logs                 0.17.1 enabled    dokku core logs plugin
+  named-containers     0.17.1 enabled    dokku core named containers plugin
+  network              0.17.1 enabled    dokku core network plugin
+  nginx-vhosts         0.17.1 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.1 enabled    dokku core plugin plugin
+  proxy                0.17.1 enabled    dokku core proxy plugin
+  ps                   0.17.1 enabled    dokku core ps plugin
+  repo                 0.17.1 enabled    dokku core repo plugin
+  shell                0.17.1 enabled    dokku core shell plugin
+  ssh-keys             0.17.1 enabled    dokku core ssh-keys plugin
+  storage              0.17.1 enabled    dokku core storage plugin
+  tags                 0.17.1 enabled    dokku core tags plugin
+  tar                  0.17.1 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 5fab84083..a874adb2c 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 490de1870..eec5d1498 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 8c2472a02..dc7a518ef 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 5dca8d055..c0a785ce7 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.0"
+    "0.17.1"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index e3ca39d28..b0ed2ad6c 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.1-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 36b6ac040..d116b7406 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index ca53f0ac3..26d069461 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 112b193b9..696b3f24a 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index c605f715c..ea31b831e 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index bb60d9641..872b6ca9e 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 638d07cb9..0b67e301d 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 3d0256a08..4b9a81435 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index fa04f44b5..3bf8d5342 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 6918505bd..ad19d67bd 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index d3f84eaba..b396448a5 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 6ba7188a0..ed34f173a 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index f2ea6c2f4..286319439 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index edeacfc2e..7251a2c26 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 8b1f360d5..6746df9ed 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index d00e968e0..d55cb158e 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 65edbd188..6ef76cda6 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 2bd83558d..1e2251ba3 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 56e4da7c4..854fbceb1 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 863769d17..0b6634e38 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 6e76be3e8..4cd4dcd58 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index d598985a8..dde9a09f2 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index f9eef3eca..cce4793d6 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 432af86c3..c9c043ab9 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index fba4bcf89..7febfeeb1 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 7c49930b2..151b59fab 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 70ce95c54..674b7194c 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index fd00e55f8..34805b25f 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index f926a9fc4..4737c299b 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 2a37125fe..0d5227424 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index b17925337..09216aaa6 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index ec7068d10..26aa70f43 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 657190192..af01d34cb 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.0"
+version = "0.17.1"
 [plugin.config]

From 919ba7ed93b6eef967269f842c39660c191c4c62 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 23 May 2019 06:17:12 -0400
Subject: [PATCH 124/163] fix: correct issue with clearing global domains

Also update tests
---
 plugins/domains/functions                | 2 +-
 plugins/domains/subcommands/clear-global | 3 ++-
 tests/unit/20_domains.bats               | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/functions b/plugins/domains/functions
index 3467b30b2..c724aad33 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -170,7 +170,7 @@ domains_add_global() {
     ) -eq 0 ]]; then
       dokku_log_info1 "Skipping: $DOMAIN already added"
     else
-      sed -i -e "\$a\\$DOMAIN" "$GLOBAL_VHOST_PATH"
+      grep -qxF "$DOMAIN" "$GLOBAL_VHOST_PATH" || echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
       dokku_log_info1 "Added $DOMAIN"
     fi
   done
diff --git a/plugins/domains/subcommands/clear-global b/plugins/domains/subcommands/clear-global
index 6cb1e2366..42ce3ee30 100755
--- a/plugins/domains/subcommands/clear-global
+++ b/plugins/domains/subcommands/clear-global
@@ -9,7 +9,8 @@ domains_clear_global_cmd() {
   local cmd="domains:clear-global"
   shift 1
 
+  dokku_log_info1_quiet "Clearing global domains"
   domains_clear_global "$@"
 }
 
-domains_add_global_cmd "$@"
+domains_clear_global_cmd "$@"
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index f23aac2b1..1fee4f290 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -253,6 +253,7 @@ teardown() {
   run /bin/bash -c "dokku domains:clear-global"
   echo "output: $output"
   echo "status: $status"
+  assert_success
   refute_line "global.dokku.invalid"
   refute_line "global.dokku.me"
 }

From b6128dc54e615bfe8594c38157d0cc4c2afecaa9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 23 May 2019 06:26:04 -0400
Subject: [PATCH 125/163] Create FUNDING.yml

---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..b36e42bce
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+open_collective: dokku
+patreon: dokku

From 0d71293fcaf934f2e1fab2f8b988b2b1a007b94e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 23 May 2019 06:40:45 -0400
Subject: [PATCH 126/163] Delete FUNDING.yml

---
 .github/FUNDING.yml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index b36e42bce..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-open_collective: dokku
-patreon: dokku

From 3a2bdd83f82e880663c861bfd6bb87eac731829f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 23 May 2019 07:02:38 -0400
Subject: [PATCH 127/163] Release 0.17.2

# History

## 0.17.2

Install/update via the bootstrap script:

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

### Bug Fixes

- #3568: @josegonzalez Correct issue with clearing global domains
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 858b20e89..d7f331255 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.17.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh
+sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3568: @josegonzalez Correct issue with clearing global domains
+
 ## 0.17.1
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index bb3d9c3fb..9f5b63c15 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh
-sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh
+sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index d2829fe4c..5a10f5289 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.1'
+VERSION = 'v0.17.2'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index d3cd42118..a7ab9e287 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.1
+Version: 0.17.2
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index e1d4280e4..3391ef4af 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.1 enabled    dokku core standard plugin
-  20_events            0.17.1 enabled    dokku core events logging plugin
-  apps                 0.17.1 enabled    dokku core apps plugin
-  build-env            0.17.1 enabled    dokku core build-env plugin
-  certs                0.17.1 enabled    dokku core certificate management plugin
-  checks               0.17.1 enabled    dokku core checks plugin
-  common               0.17.1 enabled    dokku core common plugin
-  config               0.17.1 enabled    dokku core config plugin
-  docker-options       0.17.1 enabled    dokku core docker-options plugin
-  domains              0.17.1 enabled    dokku core domains plugin
-  enter                0.17.1 enabled    dokku core enter plugin
-  git                  0.17.1 enabled    dokku core git plugin
-  logs                 0.17.1 enabled    dokku core logs plugin
-  named-containers     0.17.1 enabled    dokku core named containers plugin
-  network              0.17.1 enabled    dokku core network plugin
-  nginx-vhosts         0.17.1 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.1 enabled    dokku core plugin plugin
-  proxy                0.17.1 enabled    dokku core proxy plugin
-  ps                   0.17.1 enabled    dokku core ps plugin
-  repo                 0.17.1 enabled    dokku core repo plugin
-  shell                0.17.1 enabled    dokku core shell plugin
-  ssh-keys             0.17.1 enabled    dokku core ssh-keys plugin
-  storage              0.17.1 enabled    dokku core storage plugin
-  tags                 0.17.1 enabled    dokku core tags plugin
-  tar                  0.17.1 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.2 enabled    dokku core standard plugin
+  20_events            0.17.2 enabled    dokku core events logging plugin
+  apps                 0.17.2 enabled    dokku core apps plugin
+  build-env            0.17.2 enabled    dokku core build-env plugin
+  certs                0.17.2 enabled    dokku core certificate management plugin
+  checks               0.17.2 enabled    dokku core checks plugin
+  common               0.17.2 enabled    dokku core common plugin
+  config               0.17.2 enabled    dokku core config plugin
+  docker-options       0.17.2 enabled    dokku core docker-options plugin
+  domains              0.17.2 enabled    dokku core domains plugin
+  enter                0.17.2 enabled    dokku core enter plugin
+  git                  0.17.2 enabled    dokku core git plugin
+  logs                 0.17.2 enabled    dokku core logs plugin
+  named-containers     0.17.2 enabled    dokku core named containers plugin
+  network              0.17.2 enabled    dokku core network plugin
+  nginx-vhosts         0.17.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.2 enabled    dokku core plugin plugin
+  proxy                0.17.2 enabled    dokku core proxy plugin
+  ps                   0.17.2 enabled    dokku core ps plugin
+  repo                 0.17.2 enabled    dokku core repo plugin
+  shell                0.17.2 enabled    dokku core shell plugin
+  ssh-keys             0.17.2 enabled    dokku core ssh-keys plugin
+  storage              0.17.2 enabled    dokku core storage plugin
+  tags                 0.17.2 enabled    dokku core tags plugin
+  tar                  0.17.2 enabled    dokku core tar plugin
 ```
 
 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index a874adb2c..fff41cdcb 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index eec5d1498..fbc61f584 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index dc7a518ef..fe9bc3e4f 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index c0a785ce7..5da9f0621 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.1"
+    "0.17.2"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index b0ed2ad6c..a7b4e2d10 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.1-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index d116b7406..a88bd43a8 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 26d069461..7f8057191 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.1/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.1 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 696b3f24a..4b1d693ef 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index ea31b831e..9b4aa3a57 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 872b6ca9e..1326bd5ee 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 0b67e301d..7dfd5ef49 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 4b9a81435..583bb3f75 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 3bf8d5342..0e56befba 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index ad19d67bd..399f90f46 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index b396448a5..b4c04d148 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index ed34f173a..20e72a249 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 286319439..b64b14ddf 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 7251a2c26..713da184e 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 6746df9ed..94313dfe4 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index d55cb158e..a2c127bae 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 6ef76cda6..281109949 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 1e2251ba3..5167470aa 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 854fbceb1..57faba0d0 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 0b6634e38..4c83db2a2 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 4cd4dcd58..ffc3443bc 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index dde9a09f2..5cecbfdbb 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index cce4793d6..fde7830c5 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index c9c043ab9..c3ccc0a2d 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 7febfeeb1..84aaf9838 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 151b59fab..101febf44 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 674b7194c..461e43280 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 34805b25f..84369ed78 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 4737c299b..f56232368 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 0d5227424..1abb777e7 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 09216aaa6..509b4a77e 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 26aa70f43..b1fd57394 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index af01d34cb..5c706eebc 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.1"
+version = "0.17.2"
 [plugin.config]

From 0a173583523bb0577867f57d5040615a3097b98f Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Thu, 23 May 2019 23:20:16 +0900
Subject: [PATCH 128/163] Fix typos in trace help

---
 plugins/trace/internal-functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/trace/internal-functions b/plugins/trace/internal-functions
index c055b7a50..a29331500 100755
--- a/plugins/trace/internal-functions
+++ b/plugins/trace/internal-functions
@@ -5,8 +5,8 @@ trace_help_content_func() {
   declare desc="return trace plugin help content"
   cat <<help_content
     trace, [DEPRECATED] Enables/Disables trace mode
-    trace:on, Clones an app
-    trace:off, Create a new app
+    trace:on, Enable trace mode
+    trace:off, Disable trace mode
 help_content
 }
 

From 082e9458e52e80715f23ba84c76564c8e23ff48e Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Thu, 23 May 2019 23:23:10 +0900
Subject: [PATCH 129/163] Simplify hostname_regex

`[a-z0-9\.\*-]+` includes `\.` and `[a-z0-9\*-]+`.
So I think `^([a-z0-9\.\*-]+\.)*[a-z0-9\*-]+$` means last char is `[a-z0-9\*-]`
and other optional chars are `[a-z0-9\.\*-]*`.
---
 plugins/domains/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/functions b/plugins/domains/functions
index c724aad33..733db5c9b 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -312,7 +312,7 @@ is_global_vhost_enabled() {
 is_valid_hostname() {
   declare desc="return 0 if argument is a valid hostname; else return 1"
   local hostname_string="${1,,}"
-  local hostname_regex='^([a-z0-9\.\*-]+\.)*[a-z0-9\*-]+$'
+  local hostname_regex='^[a-z0-9\.\*-]*[a-z0-9\*-]$'
   if [[ $hostname_string =~ $hostname_regex ]]; then
     return 0
   else

From e276ebbc27eb6efbfd8d35d624cf89ab7a6dbcf0 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 28 May 2019 14:20:06 -0400
Subject: [PATCH 130/163] feat: add support for pulling app status from
 scheduler plugins

Previously, this was impossible to do if using an alternative scheduler.
---
 plugins/ps/functions                          | 22 +----------
 .../scheduler-app-status                      | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100755 plugins/scheduler-docker-local/scheduler-app-status

diff --git a/plugins/ps/functions b/plugins/ps/functions
index 627c2343c..ba4e7546d 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -222,27 +222,9 @@ get_restart_policies() {
 
 fn-ps-app-status() {
   declare APP="$1"
-  local PROCS=0 RUNNING=""
-  local APP_CIDS=$(get_app_container_ids "$APP")
 
-  for CID in $APP_CIDS; do
-    if (is_container_status "$CID" "Running"); then
-      RUNNING+="0"
-    else
-      RUNNING+="1"
-    fi
-    PROCS=$((PROCS + 1))
-  done
-
-  if [[ "${#RUNNING}" -eq 0 ]] || [[ "${#RUNNING}" -ne 0 ]] && [[ "$RUNNING" != *"0"* ]]; then
-    RUNNING="false"
-  elif [[ "$RUNNING" != *"1"* ]] && [[ "${#RUNNING}" -ne 0 ]]; then
-    RUNNING="true"
-  else
-    RUNNING="mixed"
-  fi
-
-  echo "$PROCS $RUNNING"
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
+  plugn trigger scheduler-app-status "$DOKKU_SCHEDULER" "$APP"
 }
 
 fn-ps-is-app-running() {
diff --git a/plugins/scheduler-docker-local/scheduler-app-status b/plugins/scheduler-docker-local/scheduler-app-status
new file mode 100755
index 000000000..89eddeb50
--- /dev/null
+++ b/plugins/scheduler-docker-local/scheduler-app-status
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+scheduler-app-status() {
+  declare desc="fetches the status for a given app"
+  declare trigger="scheduler-docker-local scheduler-app-status"
+  declare DOKKU_SCHEDULER="$1" APP="$2"
+
+  if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
+    return
+  fi
+
+  local PROCS=0 RUNNING=""
+  local APP_CIDS=$(get_app_container_ids "$APP")
+
+  for CID in $APP_CIDS; do
+    if (is_container_status "$CID" "Running"); then
+      RUNNING+="0"
+    else
+      RUNNING+="1"
+    fi
+    PROCS=$((PROCS + 1))
+  done
+
+  if [[ "${#RUNNING}" -eq 0 ]] || [[ "${#RUNNING}" -ne 0 ]] && [[ "$RUNNING" != *"0"* ]]; then
+    RUNNING="false"
+  elif [[ "$RUNNING" != *"1"* ]] && [[ "${#RUNNING}" -ne 0 ]]; then
+    RUNNING="true"
+  else
+    RUNNING="mixed"
+  fi
+
+  echo "$PROCS $RUNNING"
+}
+
+scheduler-app-status "$@"

From 915ef6a8d5d350b7a9370e4d72bddd33c706971d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 28 May 2019 14:55:13 -0400
Subject: [PATCH 131/163] Release 0.17.3

# History

## 0.17.3

Install/update via the bootstrap script:

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

### Bug Fixes

- #3570: @znz Fix typos in trace help

### New Features

- #3574: @josegonzalez Add support for pulling app status from scheduler plugins
- #3571: @znz Simplify hostname_regex
---
 HISTORY.md                                 | 18 ++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 130 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index d7f331255..6dd93e8c8 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,23 @@
 # History
 
+## 0.17.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh
+sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3570: @znz Fix typos in trace help
+
+### New Features
+
+- #3574: @josegonzalez Add support for pulling app status from scheduler plugins
+- #3571: @znz Simplify hostname_regex
+
 ## 0.17.2
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 9f5b63c15..29811cb35 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh
-sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh
+sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 5a10f5289..d5ca2fd5b 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.2'
+VERSION = 'v0.17.3'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index a7ab9e287..9ea23de4d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.2
+Version: 0.17.3
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 3391ef4af..59422512e 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.2 enabled    dokku core standard plugin
-  20_events            0.17.2 enabled    dokku core events logging plugin
-  apps                 0.17.2 enabled    dokku core apps plugin
-  build-env            0.17.2 enabled    dokku core build-env plugin
-  certs                0.17.2 enabled    dokku core certificate management plugin
-  checks               0.17.2 enabled    dokku core checks plugin
-  common               0.17.2 enabled    dokku core common plugin
-  config               0.17.2 enabled    dokku core config plugin
-  docker-options       0.17.2 enabled    dokku core docker-options plugin
-  domains              0.17.2 enabled    dokku core domains plugin
-  enter                0.17.2 enabled    dokku core enter plugin
-  git                  0.17.2 enabled    dokku core git plugin
-  logs                 0.17.2 enabled    dokku core logs plugin
-  named-containers     0.17.2 enabled    dokku core named containers plugin
-  network              0.17.2 enabled    dokku core network plugin
-  nginx-vhosts         0.17.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.2 enabled    dokku core plugin plugin
-  proxy                0.17.2 enabled    dokku core proxy plugin
-  ps                   0.17.2 enabled    dokku core ps plugin
-  repo                 0.17.2 enabled    dokku core repo plugin
-  shell                0.17.2 enabled    dokku core shell plugin
-  ssh-keys             0.17.2 enabled    dokku core ssh-keys plugin
-  storage              0.17.2 enabled    dokku core storage plugin
-  tags                 0.17.2 enabled    dokku core tags plugin
-  tar                  0.17.2 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.3 enabled    dokku core standard plugin
+  20_events            0.17.3 enabled    dokku core events logging plugin
+  apps                 0.17.3 enabled    dokku core apps plugin
+  build-env            0.17.3 enabled    dokku core build-env plugin
+  certs                0.17.3 enabled    dokku core certificate management plugin
+  checks               0.17.3 enabled    dokku core checks plugin
+  common               0.17.3 enabled    dokku core common plugin
+  config               0.17.3 enabled    dokku core config plugin
+  docker-options       0.17.3 enabled    dokku core docker-options plugin
+  domains              0.17.3 enabled    dokku core domains plugin
+  enter                0.17.3 enabled    dokku core enter plugin
+  git                  0.17.3 enabled    dokku core git plugin
+  logs                 0.17.3 enabled    dokku core logs plugin
+  named-containers     0.17.3 enabled    dokku core named containers plugin
+  network              0.17.3 enabled    dokku core network plugin
+  nginx-vhosts         0.17.3 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.3 enabled    dokku core plugin plugin
+  proxy                0.17.3 enabled    dokku core proxy plugin
+  ps                   0.17.3 enabled    dokku core ps plugin
+  repo                 0.17.3 enabled    dokku core repo plugin
+  shell                0.17.3 enabled    dokku core shell plugin
+  ssh-keys             0.17.3 enabled    dokku core ssh-keys plugin
+  storage              0.17.3 enabled    dokku core storage plugin
+  tags                 0.17.3 enabled    dokku core tags plugin
+  tar                  0.17.3 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index fff41cdcb..453f628f9 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index fbc61f584..606beb928 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index fe9bc3e4f..87d8fcdbc 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 5da9f0621..2ec32ef98 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.2"
+    "0.17.3"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index a7b4e2d10..32ea12717 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.3-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index a88bd43a8..59f66c267 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 7f8057191..dc1b79589 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 4b1d693ef..11704fb8b 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 9b4aa3a57..39b4cffc6 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 1326bd5ee..875e6d0bb 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 7dfd5ef49..2230170ae 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 583bb3f75..52b60ac31 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 0e56befba..50cc20f53 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 399f90f46..5adf1a31a 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index b4c04d148..08870d10f 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 20e72a249..de5334398 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index b64b14ddf..6037fa4e7 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 713da184e..b3fa1c21b 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 94313dfe4..65c4ea38d 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index a2c127bae..a61b820a0 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 281109949..39dee0d8d 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 5167470aa..4782bd0f2 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 57faba0d0..a3f182562 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 4c83db2a2..bc98e18a2 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index ffc3443bc..3fdb5eabd 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 5cecbfdbb..365408243 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index fde7830c5..0b47a08e4 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index c3ccc0a2d..7ab08ee0d 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 84aaf9838..1a28f740d 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 101febf44..89926c45d 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 461e43280..c2acf851b 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 84369ed78..c148b581e 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index f56232368..153492a2c 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 1abb777e7..e06f8cfba 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 509b4a77e..ab67562db 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index b1fd57394..e08789323 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 5c706eebc..c45e27242 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.2"
+version = "0.17.3"
 [plugin.config]

From a6408c0c560c74b7ba475ff00d8217bf68efa6f7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 28 May 2019 17:21:10 -0400
Subject: [PATCH 132/163] feat: add a way to cleanup apps for specific
 schedulers

The post-delete hook will delete config, and thus scheduler-post-delete is the best place to actually delete resources where some local config may be necessary in order to reference resources.
---
 plugins/apps/functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/apps/functions b/plugins/apps/functions
index 9bf582bb3..99ec92a3b 100755
--- a/plugins/apps/functions
+++ b/plugins/apps/functions
@@ -40,6 +40,7 @@ apps_destroy() {
   local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   local REMOVE_CONTAINERS="true"
   plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP" "$REMOVE_CONTAINERS"
+  plugn trigger scheduler-post-delete "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG"
   plugn trigger post-delete "$APP" "$IMAGE_TAG"
 }
 

From 0e03c821396ffec55b9575b979e2403b8b0eb6d4 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 28 May 2019 17:22:06 -0400
Subject: [PATCH 133/163] Release 0.17.4

# History

## 0.17.4

Install/update via the bootstrap script:

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

### New Features

- #3575: @josegonzalez Add a way to cleanup apps for specific schedulers
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 6dd93e8c8..3fc48af26 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.17.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh
+sudo DOKKU_TAG=v0.17.4 bash bootstrap.sh
+```
+
+### New Features
+
+- #3575: @josegonzalez Add a way to cleanup apps for specific schedulers
+
 ## 0.17.3
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 29811cb35..b9f8da37a 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh
-sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh
+sudo DOKKU_TAG=v0.17.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.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index d5ca2fd5b..7b5460837 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.3'
+VERSION = 'v0.17.4'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 9ea23de4d..0413df2f5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.3
+Version: 0.17.4
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 59422512e..83026e1c4 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.3 enabled    dokku core standard plugin
-  20_events            0.17.3 enabled    dokku core events logging plugin
-  apps                 0.17.3 enabled    dokku core apps plugin
-  build-env            0.17.3 enabled    dokku core build-env plugin
-  certs                0.17.3 enabled    dokku core certificate management plugin
-  checks               0.17.3 enabled    dokku core checks plugin
-  common               0.17.3 enabled    dokku core common plugin
-  config               0.17.3 enabled    dokku core config plugin
-  docker-options       0.17.3 enabled    dokku core docker-options plugin
-  domains              0.17.3 enabled    dokku core domains plugin
-  enter                0.17.3 enabled    dokku core enter plugin
-  git                  0.17.3 enabled    dokku core git plugin
-  logs                 0.17.3 enabled    dokku core logs plugin
-  named-containers     0.17.3 enabled    dokku core named containers plugin
-  network              0.17.3 enabled    dokku core network plugin
-  nginx-vhosts         0.17.3 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.3 enabled    dokku core plugin plugin
-  proxy                0.17.3 enabled    dokku core proxy plugin
-  ps                   0.17.3 enabled    dokku core ps plugin
-  repo                 0.17.3 enabled    dokku core repo plugin
-  shell                0.17.3 enabled    dokku core shell plugin
-  ssh-keys             0.17.3 enabled    dokku core ssh-keys plugin
-  storage              0.17.3 enabled    dokku core storage plugin
-  tags                 0.17.3 enabled    dokku core tags plugin
-  tar                  0.17.3 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.4 enabled    dokku core standard plugin
+  20_events            0.17.4 enabled    dokku core events logging plugin
+  apps                 0.17.4 enabled    dokku core apps plugin
+  build-env            0.17.4 enabled    dokku core build-env plugin
+  certs                0.17.4 enabled    dokku core certificate management plugin
+  checks               0.17.4 enabled    dokku core checks plugin
+  common               0.17.4 enabled    dokku core common plugin
+  config               0.17.4 enabled    dokku core config plugin
+  docker-options       0.17.4 enabled    dokku core docker-options plugin
+  domains              0.17.4 enabled    dokku core domains plugin
+  enter                0.17.4 enabled    dokku core enter plugin
+  git                  0.17.4 enabled    dokku core git plugin
+  logs                 0.17.4 enabled    dokku core logs plugin
+  named-containers     0.17.4 enabled    dokku core named containers plugin
+  network              0.17.4 enabled    dokku core network plugin
+  nginx-vhosts         0.17.4 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.4 enabled    dokku core plugin plugin
+  proxy                0.17.4 enabled    dokku core proxy plugin
+  ps                   0.17.4 enabled    dokku core ps plugin
+  repo                 0.17.4 enabled    dokku core repo plugin
+  shell                0.17.4 enabled    dokku core shell plugin
+  ssh-keys             0.17.4 enabled    dokku core ssh-keys plugin
+  storage              0.17.4 enabled    dokku core storage plugin
+  tags                 0.17.4 enabled    dokku core tags plugin
+  tar                  0.17.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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 453f628f9..d0e452fe0 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 606beb928..8595c1f29 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 87d8fcdbc..907c08484 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 2ec32ef98..dcaef01a1 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.3"
+    "0.17.4"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 32ea12717..ccde22264 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.3-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 59f66c267..97795dee5 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.4 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index dc1b79589..ca64a97a4 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.3/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.3 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.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>
diff --git a/docs/template.html b/docs/template.html
index 11704fb8b..87355e9d2 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.4/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.3/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 39b4cffc6..f546363a2 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 875e6d0bb..e3eb303f2 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 2230170ae..fd6fdc2b6 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 52b60ac31..8df523667 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 50cc20f53..0b74d1d3e 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 5adf1a31a..33cc7916a 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 08870d10f..788f209cd 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index de5334398..f09a58202 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 6037fa4e7..c2f8e345f 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index b3fa1c21b..82e74f21e 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 65c4ea38d..018c3a51c 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index a61b820a0..fab381fb0 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 39dee0d8d..c0ad08ee4 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 4782bd0f2..511fa7aff 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index a3f182562..a30f858b0 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index bc98e18a2..00c55bc50 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 3fdb5eabd..06d0a75bf 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 365408243..c5736cb64 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 0b47a08e4..a4679ad57 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 7ab08ee0d..e2f9fdd11 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 1a28f740d..60505ff29 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 89926c45d..c499bd294 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index c2acf851b..24f2bb97f 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index c148b581e..0a63ba8b9 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 153492a2c..0b197d49e 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index e06f8cfba..b4483b791 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index ab67562db..ea751249d 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index e08789323..91ebd8a08 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index c45e27242..8a8e3bed7 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.3"
+version = "0.17.4"
 [plugin.config]

From 785d9b49377743c078d97cd2964600ccc5d8f389 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 29 May 2019 00:08:02 -0400
Subject: [PATCH 134/163] feat: allow setting DOCKER_BIN path for docker
 execution

This change allows operators to specify a DOCKER_BIN environment variable. This will specify a binary to run when executing docker, which is useful in cases where the 'docker' command being run must be modified in a way that would otherwise be invasive to Dokku, but minimalistic if done within a wrapper.
---
 dokku                                         |  5 ++
 plugins/00_dokku-standard/subcommands/report  |  6 +-
 plugins/app-json/internal-functions           |  6 +-
 plugins/apps/post-delete                      |  2 +-
 plugins/apps/pre-delete                       |  2 +-
 plugins/apps/subcommands/clone                |  2 +-
 plugins/apps/subcommands/rename               |  2 +-
 plugins/build-env/pre-build-buildpack         | 12 ++--
 plugins/common/common.go                      | 16 ++++-
 plugins/common/functions                      | 66 +++++++++----------
 plugins/enter/subcommands/default             |  2 +-
 plugins/network/network.go                    |  2 +-
 plugins/ps/internal-functions                 |  2 +-
 plugins/ps/subcommands/default                |  2 +-
 .../subcommands/purge-cache/purge-cache.go    |  4 +-
 plugins/scheduler-docker-local/check-deploy   |  8 +--
 .../scheduler-docker-local/core-post-deploy   | 10 +--
 .../scheduler-docker-local/internal-functions | 12 ++--
 plugins/scheduler-docker-local/post-delete    |  6 +-
 plugins/scheduler-docker-local/pre-deploy     |  2 +-
 plugins/scheduler-docker-local/pre-restore    |  2 +-
 .../scheduler-docker-local/scheduler-deploy   | 22 +++----
 .../scheduler-docker-cleanup                  |  6 +-
 .../scheduler-docker-local/scheduler-inspect  |  2 +-
 plugins/scheduler-docker-local/scheduler-logs |  4 +-
 .../scheduler-logs-failed                     |  4 +-
 .../scheduler-docker-local/scheduler-retire   |  6 +-
 plugins/scheduler-docker-local/scheduler-run  |  2 +-
 plugins/scheduler-docker-local/scheduler-stop |  6 +-
 .../scheduler-tags-create                     |  2 +-
 .../scheduler-tags-destroy                    |  2 +-
 plugins/tags/subcommands/default              |  2 +-
 tests/unit/40_report.bats                     | 32 +++++++++
 33 files changed, 155 insertions(+), 106 deletions(-)

diff --git a/dokku b/dokku
index 6d90d7d72..09b64ecf1 100755
--- a/dokku
+++ b/dokku
@@ -2,6 +2,7 @@
 set -eo pipefail
 shopt -s nullglob
 
+export DOCKER_BIN=docker
 if [[ -r /etc/default/dokku ]]; then
   # shellcheck disable=SC1091
   source /etc/default/dokku
@@ -36,6 +37,10 @@ DOKKU_DISTRO=$(
   echo "$ID"
 )
 
+# Specify twice so that only host-level
+# configuration can ever override the DOCKER_BIN value
+export DOCKER_BIN=${DOCKER_BIN:="docker"}
+
 export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest"}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
 
diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report
index 0fb8923ab..b148c56d0 100755
--- a/plugins/00_dokku-standard/subcommands/report
+++ b/plugins/00_dokku-standard/subcommands/report
@@ -12,12 +12,12 @@ dokku_report_cmd() {
   dokku_log_info1 "memory: "
   free -m | sed "s/^/       /"
   dokku_log_info1 "docker version: "
-  docker version | sed "s/^/       /"
+  "$DOCKER_BIN" version | sed "s/^/       /"
   dokku_log_info1 "docker daemon info: "
-  docker -D info | sed "s/^/       /"
+  "$DOCKER_BIN" -D info | sed "s/^/       /"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
-  docker run --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/       /"
+  "$DOCKER_BIN" run --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/       /"
   dokku_log_info1 "dokku version: $(dokku version)"
   dokku_log_info1 "dokku plugins: "
   dokku plugin:list | sed "s/^/       /"
diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index 72cee342c..8fbbc6558 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -96,8 +96,8 @@ execute_script() {
   DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
   [[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
 
-  id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
-  if test "$(docker wait "$id")" -ne 0; then
+  id=$("$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
+  if test "$("$DOCKER_BIN" wait "$id")" -ne 0; then
     dokku_container_log_verbose_quiet "$id"
     dokku_log_fail "execution of '$SCRIPT_CMD' failed!"
   fi
@@ -120,5 +120,5 @@ execute_script() {
   fi
 
   # shellcheck disable=SC2086
-  eval docker commit $DOCKER_COMMIT_ARGS "$id" "$IMAGE" >/dev/null
+  eval "$DOCKER_BIN" commit $DOCKER_COMMIT_ARGS "$id" "$IMAGE" >/dev/null
 }
diff --git a/plugins/apps/post-delete b/plugins/apps/post-delete
index a5cb2aab3..8efe6e80d 100755
--- a/plugins/apps/post-delete
+++ b/plugins/apps/post-delete
@@ -16,7 +16,7 @@ app_post_delete() {
   fi
 
   # shellcheck disable=SC2046
-  docker rmi $(docker images -q "$IMAGE_REPO" | xargs) &>/dev/null || true
+  "$DOCKER_BIN" rmi $("$DOCKER_BIN" images -q "$IMAGE_REPO" | xargs) &>/dev/null || true
 }
 
 app_post_delete "$@"
diff --git a/plugins/apps/pre-delete b/plugins/apps/pre-delete
index 92742e2e8..92a2ae159 100755
--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -18,7 +18,7 @@ apps_pre_delete() {
   fi
 
   if [[ -d $CACHE_DIR ]]; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
   fi
 }
 
diff --git a/plugins/apps/subcommands/clone b/plugins/apps/subcommands/clone
index d911f55f9..fe6ce5387 100755
--- a/plugins/apps/subcommands/clone
+++ b/plugins/apps/subcommands/clone
@@ -44,7 +44,7 @@ apps_clone_cmd() {
   plugn trigger post-app-clone-setup "$OLD_APP" "$NEW_APP"
 
   if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   fi
   rm -rf "$NEW_CACHE_DIR"
 
diff --git a/plugins/apps/subcommands/rename b/plugins/apps/subcommands/rename
index 5f5f2e051..fcbdb88a6 100755
--- a/plugins/apps/subcommands/rename
+++ b/plugins/apps/subcommands/rename
@@ -16,7 +16,7 @@ apps_rename_cmd() {
   local OLD_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$OLD_APP/cache"
 
   if [[ -d "$OLD_CACHE_DIR" ]] && ! rmdir "$OLD_CACHE_DIR" >/dev/null 2>&1; then
-    docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   fi
   rm -rf "$OLD_CACHE_DIR"
   apps_create "$NEW_APP"
diff --git a/plugins/build-env/pre-build-buildpack b/plugins/build-env/pre-build-buildpack
index 022e8f74d..05f182163 100755
--- a/plugins/build-env/pre-build-buildpack
+++ b/plugins/build-env/pre-build-buildpack
@@ -19,14 +19,14 @@ build_env_pre_build_buildpack() {
   dokku_log_info1 "Adding BUILD_ENV to build environment..."
   # create build env files for use in buildpacks like this:
   # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
-  id=$(config_bundle --merged "$APP" | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /tmp/env; cat | tar -x -C /tmp/env")
-  test "$(docker wait "$id")" -eq 0
-  docker commit "$id" "$IMAGE" >/dev/null
+  id=$(config_bundle --merged "$APP" | "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /tmp/env; cat | tar -x -C /tmp/env")
+  test "$("$DOCKER_BIN" wait "$id")" -eq 0
+  "$DOCKER_BIN" commit "$id" "$IMAGE" >/dev/null
 
   # create build env for 'old style' buildpacks and dokku plugins
-  id=$(config_export app "$APP" --format envfile --merged | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "cat >> /app/.env")
-  test "$(docker wait "$id")" -eq 0
-  docker commit "$id" "$IMAGE" >/dev/null
+  id=$(config_export app "$APP" --format envfile --merged | "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "cat >> /app/.env")
+  test "$("$DOCKER_BIN" wait "$id")" -eq 0
+  "$DOCKER_BIN" commit "$id" "$IMAGE" >/dev/null
 }
 
 build_env_pre_build_buildpack "$@"
diff --git a/plugins/common/common.go b/plugins/common/common.go
index 99dd24d65..bdc19a95c 100644
--- a/plugins/common/common.go
+++ b/plugins/common/common.go
@@ -136,7 +136,7 @@ func DirectoryExists(filePath string) bool {
 
 // DockerInspect runs an inspect command with a given format against a container id
 func DockerInspect(containerID, format string) (output string, err error) {
-	b, err := sh.Command("docker", "inspect", "--format", format, containerID).Output()
+	b, err := sh.Command(DockerBin(), "inspect", "--format", format, containerID).Output()
 	if err != nil {
 		return "", err
 	}
@@ -253,7 +253,7 @@ func IsImageHerokuishBased(image string) bool {
 	}
 
 	dockerGlobalArgs := os.Getenv("DOKKU_GLOBAL_RUN_ARGS")
-	parts := []string{"docker", "run", dockerGlobalArgs, "--entrypoint=\"/bin/sh\"", dockerArgs, image, "-c", "\"test -f /exec\""}
+	parts := []string{DockerBin(), "run", dockerGlobalArgs, "--entrypoint=\"/bin/sh\"", dockerArgs, image, "-c", "\"test -f /exec\""}
 
 	var dockerCmdParts []string
 	for _, str := range parts {
@@ -339,11 +339,21 @@ func VerifyAppName(appName string) (err error) {
 
 // VerifyImage returns true if docker image exists in local repo
 func VerifyImage(image string) bool {
-	imageCmd := NewShellCmd(strings.Join([]string{"docker inspect", image}, " "))
+	imageCmd := NewShellCmd(strings.Join([]string{DockerBin(), "inspect", image}, " "))
 	imageCmd.ShowOutput = false
 	return imageCmd.Execute()
 }
 
+// DockerBin returns a string which contains a path to the current docker binary
+func DockerBin() string {
+	dockerBin := os.Getenv("DOCKER_BIN")
+	if dockerBin == "" {
+		dockerBin = "docker"
+	}
+
+	return dockerBin
+}
+
 //PlugnTrigger fire the given plugn trigger with the given args
 func PlugnTrigger(triggerName string, args ...string) error {
 	shellArgs := make([]interface{}, len(args)+2)
diff --git a/plugins/common/functions b/plugins/common/functions
index 08d921071..10db6dcf8 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -171,7 +171,7 @@ dokku_container_log_verbose_quiet() {
   OIFS=$IFS
   IFS=$'\n'
   local line
-  for line in $(docker logs "$CID" 2>&1); do
+  for line in $("$DOCKER_BIN" logs "$CID" 2>&1); do
     dokku_log_verbose_quiet "$line"
   done
   IFS=$OIFS
@@ -203,7 +203,7 @@ verify_app_name() {
 verify_image() {
   declare desc="verify image existence"
   local IMAGE="$1"
-  if (docker inspect "$IMAGE" &>/dev/null); then
+  if "$DOCKER_BIN" inspect "$IMAGE" &>/dev/null; then
     return 0
   else
     return 1
@@ -282,7 +282,7 @@ get_running_image_tag() {
   verify_app_name "$APP"
 
   local CIDS=($(get_app_container_ids "$APP"))
-  local RUNNING_IMAGE_TAG=$(docker inspect -f '{{ .Config.Image }}' "${CIDS[0]}" 2>/dev/null | awk -F: '{ print $2 }' || echo '')
+  local RUNNING_IMAGE_TAG=$("$DOCKER_BIN" inspect -f '{{ .Config.Image }}' "${CIDS[0]}" 2>/dev/null | awk -F: '{ print $2 }' || echo '')
   echo "$RUNNING_IMAGE_TAG"
 }
 
@@ -296,13 +296,13 @@ is_image_herokuish_based() {
   fi
 
   # due to how the build process works, all herokuish images have the Environment variable USER=herokuishuser
-  USER_VALUE="$(docker inspect -f '{{range .Config.Env}}{{if eq . "USER=herokuishuser" }}{{println .}}{{end}}{{end}}' "$IMAGE")"
+  USER_VALUE="$("$DOCKER_BIN" inspect -f '{{range .Config.Env}}{{if eq . "USER=herokuishuser" }}{{println .}}{{end}}{{end}}' "$IMAGE")"
   [[ "$USER_VALUE" == "" ]] && return 1
   return 0
 }
 
 get_docker_version() {
-  CLIENT_VERSION_STRING="$(docker version -f="{{ .Client.Version }}")"
+  CLIENT_VERSION_STRING="$("$DOCKER_BIN" version -f="{{ .Client.Version }}")"
   echo "$CLIENT_VERSION_STRING"
 }
 
@@ -376,19 +376,19 @@ copy_from_image() {
       if is_image_herokuish_based "$IMAGE"; then
         WORKDIR="/app"
       else
-        WORKDIR="$(docker inspect -f '{{.Config.WorkingDir}}' "$IMAGE")"
+        WORKDIR="$("$DOCKER_BIN" inspect -f '{{.Config.WorkingDir}}' "$IMAGE")"
       fi
 
       if [[ -n "$WORKDIR" ]]; then
         SRC_FILE="${WORKDIR}/${SRC_FILE}"
       fi
     fi
-    local CID=$(docker create "$DOKKU_GLOBAL_RUN_ARGS" "$IMAGE")
-    if ! docker cp "$CID:$SRC_FILE" "$DST_DIR"; then
-      docker rm -f "$CID" &>/dev/null
+    local CID=$("$DOCKER_BIN" create "$DOKKU_GLOBAL_RUN_ARGS" "$IMAGE")
+    if ! "$DOCKER_BIN" cp "$CID:$SRC_FILE" "$DST_DIR"; then
+      "$DOCKER_BIN" rm -f "$CID" &>/dev/null
       return 1
     fi
-    docker rm -f "$CID" &>/dev/null
+    "$DOCKER_BIN" rm -f "$CID" &>/dev/null
   else
     return 1
   fi
@@ -470,7 +470,7 @@ is_container_running() {
   local CONTAINER_STATUS
 
   dokku_log_warn "Deprecated: common#is_container_status"
-  CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
+  CONTAINER_STATUS=$("$DOCKER_BIN" inspect -f '{{.State.Running}}' "$CID" || true)
 
   if [[ "$CONTAINER_STATUS" == "true" ]]; then
     return 0
@@ -483,7 +483,7 @@ is_container_status() {
   declare desc="return 0 if given docker container id is in given state"
   local CID=$1
   local TEMPLATE="{{.State.$2}}"
-  local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" 2>/dev/null || true)
+  local CONTAINER_STATUS=$("$DOCKER_BIN" inspect -f "$TEMPLATE" "$CID" 2>/dev/null || true)
 
   if [[ "$CONTAINER_STATUS" == "true" ]]; then
     return 0
@@ -529,9 +529,9 @@ dokku_build() {
   case "$IMAGE_SOURCE_TYPE" in
     herokuish)
       DOKKU_IMAGE="$(config_get "$APP" DOKKU_IMAGE || echo "$DOKKU_IMAGE")"
-      cid=$(tar -c . | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$DOKKU_IMAGE" /bin/bash -c "mkdir -p /app && tar -xC /app")
-      test "$(docker wait "$cid")" -eq 0
-      docker commit "$cid" "$IMAGE" >/dev/null
+      cid=$(tar -c . | "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$DOKKU_IMAGE" /bin/bash -c "mkdir -p /app && tar -xC /app")
+      test "$("$DOCKER_BIN" wait "$cid")" -eq 0
+      "$DOCKER_BIN" commit "$cid" "$IMAGE" >/dev/null
       [[ -d $DOKKU_APP_CACHE_DIR ]] || mkdir -p "$DOKKU_APP_CACHE_DIR"
       plugn trigger pre-build-buildpack "$APP"
 
@@ -543,10 +543,10 @@ dokku_build() {
       declare -a ARG_ARRAY
       eval "ARG_ARRAY=($DOCKER_ARGS)"
       # shellcheck disable=SC2086
-      cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_HOST_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
-      docker attach "$cid"
-      test "$(docker wait "$cid")" -eq 0
-      docker commit "$cid" "$IMAGE" >/dev/null
+      cid=$("$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_HOST_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
+      "$DOCKER_BIN" attach "$cid"
+      test "$("$DOCKER_BIN" wait "$cid")" -eq 0
+      "$DOCKER_BIN" commit "$cid" "$IMAGE" >/dev/null
 
       plugn trigger post-build-buildpack "$APP"
       ;;
@@ -574,7 +574,7 @@ dokku_build() {
       eval "ARG_ARRAY=($DOCKER_ARGS)"
 
       # shellcheck disable=SC2086
-      docker build "${ARG_ARRAY[@]}" $DOKKU_DOCKER_BUILD_OPTS -t $IMAGE .
+      "$DOCKER_BIN" build "${ARG_ARRAY[@]}" $DOKKU_DOCKER_BUILD_OPTS -t $IMAGE .
 
       plugn trigger post-build-dockerfile "$APP"
       ;;
@@ -600,14 +600,14 @@ dokku_release() {
     herokuish)
       plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
       if [[ -n $(config_export global) ]]; then
-        cid=$(config_export global | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
-        test "$(docker wait "$cid")" -eq 0
-        docker commit "$cid" "$IMAGE" >/dev/null
+        cid=$(config_export global | "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
+        test "$("$DOCKER_BIN" wait "$cid")" -eq 0
+        "$DOCKER_BIN" commit "$cid" "$IMAGE" >/dev/null
       fi
       if [[ -n $(config_export app "$APP") ]]; then
-        cid=$(config_export app "$APP" | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
-        test "$(docker wait "$cid")" -eq 0
-        docker commit "$cid" "$IMAGE" >/dev/null
+        cid=$(config_export app "$APP" | "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
+        test "$("$DOCKER_BIN" wait "$cid")" -eq 0
+        "$DOCKER_BIN" commit "$cid" "$IMAGE" >/dev/null
       fi
       plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG"
       ;;
@@ -713,15 +713,15 @@ docker_cleanup() {
 
   # delete all non-running containers
   # shellcheck disable=SC2046
-  docker rm $(docker ps -a -f "status=exited" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
+  "$DOCKER_BIN" rm $("$DOCKER_BIN" ps -a -f "status=exited" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
 
   # delete all dead containers
   # shellcheck disable=SC2046
-  docker rm $(docker ps -a -f "status=dead" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
+  "$DOCKER_BIN" rm $("$DOCKER_BIN" ps -a -f "status=dead" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
 
   # delete unused images
   # shellcheck disable=SC2046
-  docker rmi $(docker images -f 'dangling=true' -q) &>/dev/null &
+  "$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null &
 }
 
 get_available_port() {
@@ -797,7 +797,7 @@ get_exposed_ports_from_image() {
   local IMAGE="$1"
   verify_image "$IMAGE"
   # shellcheck disable=SC2016
-  local DOCKER_IMAGE_EXPOSED_PORTS="$(docker inspect -f '{{range $key, $value := .Config.ExposedPorts}}{{$key}} {{end}}' "$IMAGE")"
+  local DOCKER_IMAGE_EXPOSED_PORTS="$("$DOCKER_BIN" inspect -f '{{range $key, $value := .Config.ExposedPorts}}{{$key}} {{end}}' "$IMAGE")"
   echo "$DOCKER_IMAGE_EXPOSED_PORTS"
 }
 
@@ -805,7 +805,7 @@ get_entrypoint_from_image() {
   declare desc="return .Config.Entrypoint from passed image name"
   local IMAGE="$1"
   verify_image "$IMAGE"
-  local DOCKER_IMAGE_ENTRYPOINT="$(docker inspect --format '{{range .Config.Entrypoint}}{{.}} {{end}}' "$IMAGE")"
+  local DOCKER_IMAGE_ENTRYPOINT="$("$DOCKER_BIN" inspect --format '{{range .Config.Entrypoint}}{{.}} {{end}}' "$IMAGE")"
   echo "ENTRYPOINT $DOCKER_IMAGE_ENTRYPOINT"
 }
 
@@ -813,7 +813,7 @@ get_cmd_from_image() {
   declare desc="return .Config.Cmd from passed image name"
   local IMAGE="$1"
   verify_image "$IMAGE"
-  local DOCKER_IMAGE_CMD="$(docker inspect --format '{{range .Config.Cmd}}{{.}} {{end}}' "$IMAGE")"
+  local DOCKER_IMAGE_CMD="$("$DOCKER_BIN" inspect --format '{{range .Config.Cmd}}{{.}} {{end}}' "$IMAGE")"
   DOCKER_IMAGE_CMD="${DOCKER_IMAGE_CMD/\/bin\/sh -c/}"
   echo "CMD $DOCKER_IMAGE_CMD"
 }
@@ -851,7 +851,7 @@ get_container_ports() {
   local cid
 
   for cid in $APP_CIDS; do
-    local container_ports="$(docker port "$cid" | awk '{ print $3 "->" $1}' | awk -F ":" '{ print $2 }')"
+    local container_ports="$("$DOCKER_BIN" port "$cid" | awk '{ print $3 "->" $1}' | awk -F ":" '{ print $2 }')"
   done
 
   echo "$container_ports"
diff --git a/plugins/enter/subcommands/default b/plugins/enter/subcommands/default
index a822824ec..5eb6ffbc3 100755
--- a/plugins/enter/subcommands/default
+++ b/plugins/enter/subcommands/default
@@ -60,7 +60,7 @@ enter_default_cmd() {
   has_tty && local DOKKU_RUN_OPTS+=" -i -t"
   is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
   # shellcheck disable=SC2086
-  docker exec $DOKKU_RUN_OPTS $ID $EXEC_CMD "${@:-$DOKKU_APP_SHELL}"
+  "$DOCKER_BIN" exec $DOKKU_RUN_OPTS $ID $EXEC_CMD "${@:-$DOKKU_APP_SHELL}"
 }
 
 enter_default_cmd "$@"
diff --git a/plugins/network/network.go b/plugins/network/network.go
index 55a32c629..c561986a8 100644
--- a/plugins/network/network.go
+++ b/plugins/network/network.go
@@ -132,7 +132,7 @@ func GetContainerPort(appName, processType string, isHerokuishContainer bool, co
 				break
 			}
 		}
-		cmd := sh.Command("docker", "port", containerID, port)
+		cmd := sh.Command(common.DockerBin(), "port", containerID, port)
 		cmd.Stderr = ioutil.Discard
 		b, err := cmd.Output()
 		if err == nil {
diff --git a/plugins/ps/internal-functions b/plugins/ps/internal-functions
index 4cab309cb..c618041e8 100755
--- a/plugins/ps/internal-functions
+++ b/plugins/ps/internal-functions
@@ -61,7 +61,7 @@ cmd-ps-report-single() {
   local APP_CONTAINER_STATUS
   for CONTAINER_FILE in $CONTAINER_FILES; do
     CID=$(<"$DOKKU_ROOT/$APP/$CONTAINER_FILE")
-    APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID" 2>/dev/null || true)
+    APP_CONTAINER_STATUS=$("$DOCKER_BIN" inspect -f '{{.State.Status}}' "$CID" 2>/dev/null || true)
     [[ -z "$APP_CONTAINER_STATUS" ]] && APP_CONTAINER_STATUS="missing"
     STATUSES+=("${CONTAINER_FILE#*.}:$APP_CONTAINER_STATUS#${CID:0:12}")
   done
diff --git a/plugins/ps/subcommands/default b/plugins/ps/subcommands/default
index ed5ca1182..8fc9f35c2 100755
--- a/plugins/ps/subcommands/default
+++ b/plugins/ps/subcommands/default
@@ -21,7 +21,7 @@ ps_main_cmd() {
     has_tty && local DOKKU_RUN_OPTS="-i -t"
     dokku_log_info1_quiet "running processes in container: $CID"
     # shellcheck disable=SC2086
-    docker exec $DOKKU_RUN_OPTS $CID /bin/sh -c "ps auxwww"
+    "$DOCKER_BIN" exec $DOKKU_RUN_OPTS $CID /bin/sh -c "ps auxwww"
   done
 }
 
diff --git a/plugins/repo/src/subcommands/purge-cache/purge-cache.go b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
index 6a39cde85..a1cf19728 100644
--- a/plugins/repo/src/subcommands/purge-cache/purge-cache.go
+++ b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
@@ -25,7 +25,9 @@ func main() {
 	dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
 	image := common.GetDeployingAppImageName(appName, "", "")
 	if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
-		purgeCacheCmd := common.NewShellCmd(strings.Join([]string{"docker run --rm", dokkuGlobalRunArgs,
+		purgeCacheCmd := common.NewShellCmd(strings.Join([]string{
+			common.DockerBin(),
+			"run --rm", dokkuGlobalRunArgs,
 			"-v", strings.Join([]string{cacheHostDir, ":/cache"}, ""), image,
 			`find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} ;`}, " "))
 		purgeCacheCmd.Execute()
diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy
index 721d9c0e6..148c427f7 100755
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -85,7 +85,7 @@ scheduler-docker-local-check-deploy() {
   # after successfully copying the file. Thus, we suppress stderr.
   # ref: https://github.com/dotcloud/docker/issues/3986
   local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
-  docker cp "$DOKKU_APP_CONTAINER_ID:/app/CHECKS" "$CHECK_DEPLOY_TMP_WORK_DIR" 2>/dev/null || true
+  "$DOCKER_BIN" cp "$DOKKU_APP_CONTAINER_ID:/app/CHECKS" "$CHECK_DEPLOY_TMP_WORK_DIR" 2>/dev/null || true
 
   local FILENAME=${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS
 
@@ -119,10 +119,10 @@ scheduler-docker-local-check-deploy() {
     sleep "$DOKKU_DEFAULT_CHECKS_WAIT"
 
     ! (is_container_status "$DOKKU_APP_CONTAINER_ID" "Running") && dokku_log_fail "App container failed to start!!"
-    local container_restarts="$(docker inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")"
+    local container_restarts="$("$DOCKER_BIN" inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")"
     if [[ $container_restarts -ne 0 ]]; then
-      docker container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
-      docker stop "$DOKKU_APP_CONTAINER_ID" || true
+      "$DOCKER_BIN" container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
+      "$DOCKER_BIN" stop "$DOKKU_APP_CONTAINER_ID" || true
       dokku_log_fail "App container failed to start!!"
     fi
 
diff --git a/plugins/scheduler-docker-local/core-post-deploy b/plugins/scheduler-docker-local/core-post-deploy
index 5a24b04ef..f78f34c49 100755
--- a/plugins/scheduler-docker-local/core-post-deploy
+++ b/plugins/scheduler-docker-local/core-post-deploy
@@ -36,26 +36,26 @@ scheduler-docker-local-core-post-deploy() {
     local NAME="$APP.$DYNO"
     local CURRENT_CONTAINER_ID="$(<"$container")"
     # TODO: Ensure these are from the current service
-    local PREVIOUS_CIDS=$(docker ps -a -q -f name="^.?$NAME\$" | xargs) || true
+    local PREVIOUS_CIDS=$("$DOCKER_BIN" ps -a -q -f name="^.?$NAME\$" | xargs) || true
     if [[ -n $PREVIOUS_CIDS ]]; then
       dokku_log_info1_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
       # in case $PREVIOUS_CIDS has more than one entry
       local cid
       for cid in $PREVIOUS_CIDS; do
-        local PREVIOUS_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$cid" || echo "dead")
+        local PREVIOUS_CONTAINER_STATUS=$("$DOCKER_BIN" inspect -f '{{.State.Status}}' "$cid" || echo "dead")
         # dead containers cannot be renamed
         if [[ "$PREVIOUS_CONTAINER_STATUS" != "dead" ]]; then
           local CONTAINER_DATE_NAME="$NAME.$(date +%s)"
           dokku_log_info2_quiet "Renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
-          docker rename "$NAME" "$CONTAINER_DATE_NAME" >/dev/null 2>&1 || dokku_log_warn "Unable to rename container"
+          "$DOCKER_BIN" rename "$NAME" "$CONTAINER_DATE_NAME" >/dev/null 2>&1 || dokku_log_warn "Unable to rename container"
         fi
       done
     fi
     local ID=$(cat "$container")
-    local CURRENT_NAME=$(docker inspect -f '{{.Name}}' "$ID" | tr -d /)
+    local CURRENT_NAME=$("$DOCKER_BIN" inspect -f '{{.Name}}' "$ID" | tr -d /)
     if [[ -n "$CURRENT_NAME" ]]; then
       dokku_log_info2_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
-      docker rename "$CURRENT_NAME" "$NAME" >/dev/null
+      "$DOCKER_BIN" rename "$CURRENT_NAME" "$NAME" >/dev/null
     fi
   done
   shopt -u nullglob
diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions
index 7dc24d0bf..b787a067d 100755
--- a/plugins/scheduler-docker-local/internal-functions
+++ b/plugins/scheduler-docker-local/internal-functions
@@ -95,7 +95,7 @@ fn-scheduler-docker-local-retire-container() {
   declare APP="$1" CID="$2" DEAD_TIME="$3"
   local STATE
 
-  STATE="$(docker inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
+  STATE="$("$DOCKER_BIN" inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
   if [[ -z "$STATE" ]]; then
     return
   fi
@@ -104,7 +104,7 @@ fn-scheduler-docker-local-retire-container() {
   [[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
 
   if [[ "$STATE" == "restarting" ]]; then
-    docker update --restart=no "$CID" >/dev/null 2>&1
+    "$DOCKER_BIN" update --restart=no "$CID" >/dev/null 2>&1
   fi
 
   if [[ "$STATE" != "dead" ]] && [[ "$STATE" != "exited" ]]; then
@@ -112,18 +112,18 @@ fn-scheduler-docker-local-retire-container() {
     # to not send SIGKILL as the docs would indicate. If that fails, move
     # on to the next.
     # shellcheck disable=SC2086
-    docker stop $DOCKER_STOP_TIME_ARG "$CID" \
-      || docker kill "$CID" \
+    "$DOCKER_BIN" stop $DOCKER_STOP_TIME_ARG "$CID" \
+      || "$DOCKER_BIN" kill "$CID" \
       || dokku_log_warn "Unable to kill container ${CID}"
   fi
 
-  STATE="$(docker inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
+  STATE="$("$DOCKER_BIN" inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
   if [[ -z "$STATE" ]]; then
     return
   fi
 
   if [[ "$STATE" != "dead" ]] && [[ "$STATE" != "exited" ]]; then
-    if ! docker kill "$CID"; then
+    if ! "$DOCKER_BIN" kill "$CID"; then
       dokku_log_warn "Unable to kill container ${CID}"
     fi
   fi
diff --git a/plugins/scheduler-docker-local/post-delete b/plugins/scheduler-docker-local/post-delete
index c180c0905..405ecde4f 100755
--- a/plugins/scheduler-docker-local/post-delete
+++ b/plugins/scheduler-docker-local/post-delete
@@ -18,14 +18,14 @@ scheduler-docker-local-post-delete() {
 
   # remove all application containers & images
   # shellcheck disable=SC2046
-  local DOKKU_APP_CIDS=$(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs)
+  local DOKKU_APP_CIDS=$("$DOCKER_BIN" ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs)
   if [[ -n "$DOKKU_APP_CIDS" ]]; then
     # shellcheck disable=SC2086
-    docker rm -f $DOKKU_APP_CIDS >/dev/null 2>&1 || true
+    "$DOCKER_BIN" rm -f $DOKKU_APP_CIDS >/dev/null 2>&1 || true
   fi
 
   # shellcheck disable=SC2046
-  docker rmi $(docker images -q "$IMAGE_REPO" | xargs) &>/dev/null || true
+  "$DOCKER_BIN" rmi $("$DOCKER_BIN" images -q "$IMAGE_REPO" | xargs) &>/dev/null || true
 }
 
 scheduler-docker-local-post-delete "$@"
diff --git a/plugins/scheduler-docker-local/pre-deploy b/plugins/scheduler-docker-local/pre-deploy
index d1b798799..244b65830 100755
--- a/plugins/scheduler-docker-local/pre-deploy
+++ b/plugins/scheduler-docker-local/pre-deploy
@@ -42,7 +42,7 @@ scheduler-docker-local-pre-deploy() {
   fi
 
   # shellcheck disable=SC2086
-  docker run $DOKKU_GLOBAL_RUN_ARGS "${ARG_ARRAY[@]}" $IMAGE /bin/bash -c "find $CONTAINER_PATHS -not -user $DOKKU_APP_USER -print0 | xargs -0 -r chown -R $DOKKU_APP_USER" || true
+  "$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS "${ARG_ARRAY[@]}" $IMAGE /bin/bash -c "find $CONTAINER_PATHS -not -user $DOKKU_APP_USER -print0 | xargs -0 -r chown -R $DOKKU_APP_USER" || true
 }
 
 scheduler-docker-local-pre-deploy "$@"
diff --git a/plugins/scheduler-docker-local/pre-restore b/plugins/scheduler-docker-local/pre-restore
index 7423a636f..802167ffb 100755
--- a/plugins/scheduler-docker-local/pre-restore
+++ b/plugins/scheduler-docker-local/pre-restore
@@ -14,7 +14,7 @@ scheduler-docker-local-pre-restore() {
 
   # delete all "old" containers
   # shellcheck disable=SC2046
-  docker rm $(docker ps --format "{{.Names}}" -a -f "label=$DOKKU_CONTAINER_LABEL" -q | grep -E '(.+\..+\.[0-9]+\.[0-9]+$)') &>/dev/null || true
+  "$DOCKER_BIN" rm $("$DOCKER_BIN" ps --format "{{.Names}}" -a -f "label=$DOKKU_CONTAINER_LABEL" -q | grep -E '(.+\..+\.[0-9]+\.[0-9]+$)') &>/dev/null || true
 }
 
 scheduler-docker-local-pre-restore "$@"
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index 99f73a262..8fd16640f 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -52,10 +52,10 @@ scheduler-docker-local-scheduler-deploy() {
         dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"
 
         # Disable the container restart policy
-        docker container update --restart=no "$cid" &>/dev/null || true
+        "$DOCKER_BIN" container update --restart=no "$cid" &>/dev/null || true
 
         # shellcheck disable=SC2086
-        docker stop $DOCKER_STOP_TIME_ARG "$cid" &>/dev/null
+        "$DOCKER_BIN" stop $DOCKER_STOP_TIME_ARG "$cid" &>/dev/null
         # remove cid from oldids to skip the old container finish processing
         oldids="$(remove_val_from_list "$cid" "$oldids" " ")"
       done
@@ -94,16 +94,16 @@ scheduler-docker-local-scheduler-deploy() {
         START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH" "$DOKKU_PORT")
         if [[ "$DOKKU_NETWORK_BIND_ALL" == "false" ]]; then
           # shellcheck disable=SC2086
-          cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -e PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
+          cid=$("$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS -d -e PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
         else
           # shellcheck disable=SC2086
-          cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOKKU_DOCKER_PORT_ARGS -e PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
+          cid=$("$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS -d $DOKKU_DOCKER_PORT_ARGS -e PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
         fi
       else
         START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH")
 
         # shellcheck disable=SC2086
-        cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
+        cid=$("$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS -d "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
       fi
 
       ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$cid")
@@ -114,10 +114,10 @@ scheduler-docker-local-scheduler-deploy() {
         declare CID="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
         mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP"
         echo "${CID} ${PROC_TYPE}.${CONTAINER_INDEX}" >>"${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
-        docker inspect "$CID" &>/dev/null && {
+        "$DOCKER_BIN" inspect "$CID" &>/dev/null && {
           # Disable the container restart policy
-          docker container update --restart=no "$CID" &>/dev/null || true
-          docker stop "$CID" >/dev/null && docker kill "$CID" &>/dev/null
+          "$DOCKER_BIN" container update --restart=no "$CID" &>/dev/null || true
+          "$DOCKER_BIN" stop "$CID" >/dev/null && "$DOCKER_BIN" kill "$CID" &>/dev/null
         }
         trap - INT TERM EXIT
         kill -9 $$
@@ -181,14 +181,14 @@ scheduler-docker-local-scheduler-deploy() {
       sleep "$WAIT"
       for oldid in $oldids; do
         # Disable the container restart policy
-        docker container update --restart=no "$oldid" &>/dev/null || true
+        "$DOCKER_BIN" container update --restart=no "$oldid" &>/dev/null || true
 
         # Attempt to stop, if that fails, then force a kill as docker seems
         # to not send SIGKILL as the docs would indicate. If that fails, move
         # on to the next.
         # shellcheck disable=SC2086
-        docker stop $DOCKER_STOP_TIME_ARG "$oldid" \
-          || docker kill "$oldid" \
+        "$DOCKER_BIN" stop $DOCKER_STOP_TIME_ARG "$oldid" \
+          || "$DOCKER_BIN" kill "$oldid" \
           || plugn trigger retire-container-failed "$APP" "$oldid" # plugin trigger for event logging
       done
     ) &
diff --git a/plugins/scheduler-docker-local/scheduler-docker-cleanup b/plugins/scheduler-docker-local/scheduler-docker-cleanup
index 73e6e7a7d..5e89ef8cd 100755
--- a/plugins/scheduler-docker-local/scheduler-docker-cleanup
+++ b/plugins/scheduler-docker-local/scheduler-docker-cleanup
@@ -14,15 +14,15 @@ scheduler-docker-local-scheduler-docker-cleanup() {
 
   # delete all non-running containers
   # shellcheck disable=SC2046
-  docker rm $(docker ps -a -f "status=exited" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
+  "$DOCKER_BIN" rm $("$DOCKER_BIN" ps -a -f "status=exited" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
 
   # delete all dead containers
   # shellcheck disable=SC2046
-  docker rm $(docker ps -a -f "status=dead" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
+  "$DOCKER_BIN" rm $("$DOCKER_BIN" ps -a -f "status=dead" -f "label=$DOKKU_CONTAINER_LABEL" -q) &>/dev/null || true
 
   # delete unused images
   # shellcheck disable=SC2046
-  docker rmi $(docker images -f 'dangling=true' -q) &>/dev/null &
+  "$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null &
 }
 
 scheduler-docker-local-scheduler-docker-cleanup "$@"
diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect
index 1a4eb6719..5353f3291 100755
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -48,7 +48,7 @@ EOF
   for CONTAINER_FILE in $CONTAINER_FILES; do
     CIDS+="$(<"$DOKKU_ROOT/$APP/$CONTAINER_FILE")"
   done
-  docker inspect "${CIDS[@]}" | python2.7 "$TMP_INSPECT_CMD"
+  "$DOCKER_BIN" inspect "${CIDS[@]}" | python2.7 "$TMP_INSPECT_CMD"
 
 }
 
diff --git a/plugins/scheduler-docker-local/scheduler-logs b/plugins/scheduler-docker-local/scheduler-logs
index 724a1d4f8..d785388e8 100755
--- a/plugins/scheduler-docker-local/scheduler-logs
+++ b/plugins/scheduler-docker-local/scheduler-logs
@@ -33,10 +33,10 @@ scheduler-docker-local-scheduler-logs() {
     local CID=$(<"${CONTAINERS[i]}")
     local COLOR=${COLORS[i % ${#COLORS[*]}]}
     if [[ $PRETTY_PRINT == "true" ]]; then
-      local DOKKU_LOGS_CMD+="(docker logs $DOKKU_LOGS_ARGS $CID 2>&1)"
+      local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
     else
       local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
-      local DOKKU_LOGS_CMD+="(docker logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
+      local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
     fi
     if [[ $i != "$MAX_INDEX" ]]; then
       local DOKKU_LOGS_CMD+="& "
diff --git a/plugins/scheduler-docker-local/scheduler-logs-failed b/plugins/scheduler-docker-local/scheduler-logs-failed
index d816155e2..476e91b72 100755
--- a/plugins/scheduler-docker-local/scheduler-logs-failed
+++ b/plugins/scheduler-docker-local/scheduler-logs-failed
@@ -24,7 +24,7 @@ scheduler-docker-local-scheduler-logs-failed() {
   while read -r LINE || [[ -n "$LINE" ]]; do
     CID="$(echo "$LINE" | cut -d ' ' -f1)"
     PREFIX="$(echo "$LINE" | cut -d ' ' -f2)"
-    if docker inspect "${CID}" >/dev/null 2>&1; then
+    if "$DOCKER_BIN" inspect "${CID}" >/dev/null 2>&1; then
       RUNNING_CONTAINERS+=("$CID")
     else
       DEAD_CONTAINERS+=("$CID")
@@ -44,7 +44,7 @@ scheduler-docker-local-scheduler-logs-failed() {
   ((MAX_INDEX = ${#RUNNING_CONTAINERS[*]} - 1)) || true
   for i in ${!RUNNING_CONTAINERS[*]}; do
     local CID="${RUNNING_CONTAINERS[i]}"
-    DOKKU_LOGS_CMD+="(docker logs $DOKKU_LOGS_ARGS $CID 2>&1)"
+    DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
     if [[ $i != "$MAX_INDEX" ]]; then
       local DOKKU_LOGS_CMD+="& "
     else
diff --git a/plugins/scheduler-docker-local/scheduler-retire b/plugins/scheduler-docker-local/scheduler-retire
index c65c2c66e..af24e75ad 100755
--- a/plugins/scheduler-docker-local/scheduler-retire
+++ b/plugins/scheduler-docker-local/scheduler-retire
@@ -27,7 +27,7 @@ scheduler-docker-local-scheduler-retire() {
     fi
 
     fn-scheduler-docker-local-retire-container "$APP" "$CID" "$DEAD_TIME"
-    STATE="$(docker inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
+    STATE="$("$DOCKER_BIN" inspect -f "{{ .State.Status }}" "$CID" 2>/dev/null || true)"
     if [[ -z "$STATE" ]]; then
       DEAD_CONTAINERS+=("$CID")
       continue
@@ -38,8 +38,8 @@ scheduler-docker-local-scheduler-retire() {
       continue
     fi
 
-    docker rm -f "$CID" >/dev/null 2>&1 || true
-    if docker inspect "${CID}" >/dev/null 2>&1; then
+    "$DOCKER_BIN" rm -f "$CID" >/dev/null 2>&1 || true
+    if "$DOCKER_BIN" inspect "${CID}" >/dev/null 2>&1; then
       dokku_log_warn "Container ${CID} still running"
       continue
     fi
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index 6ace670c5..478a429a1 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -66,7 +66,7 @@ scheduler-docker-local-scheduler-run() {
   fi
 
   # shellcheck disable=SC2086
-  docker run $DOKKU_GLOBAL_RUN_ARGS "${DOCKER_ARGS_ARRAY[@]}" $IMAGE $EXEC_CMD "$@"
+  "$DOCKER_BIN" run $DOKKU_GLOBAL_RUN_ARGS "${DOCKER_ARGS_ARRAY[@]}" $IMAGE $EXEC_CMD "$@"
 }
 
 scheduler-docker-local-scheduler-run "$@"
diff --git a/plugins/scheduler-docker-local/scheduler-stop b/plugins/scheduler-docker-local/scheduler-stop
index 3edb3431a..553b950bd 100755
--- a/plugins/scheduler-docker-local/scheduler-stop
+++ b/plugins/scheduler-docker-local/scheduler-stop
@@ -21,10 +21,10 @@ scheduler-docker-local-scheduler-stop() {
   if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
     # Disable the container restart policy
     # shellcheck disable=SC2086
-    docker container update --restart=no $DOKKU_APP_RUNNING_CONTAINER_IDS &>/dev/null || true
+    "$DOCKER_BIN" container update --restart=no $DOKKU_APP_RUNNING_CONTAINER_IDS &>/dev/null || true
 
     # shellcheck disable=SC2086
-    docker stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
+    "$DOCKER_BIN" stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
   fi
 
   if [[ "$REMOVE_CONTAINERS" == "true" ]]; then
@@ -32,7 +32,7 @@ scheduler-docker-local-scheduler-stop() {
 
     if [[ -n "$DOKKU_APP_CIDS" ]]; then
       # shellcheck disable=SC2086
-      docker rm -f $DOKKU_APP_CIDS >/dev/null 2>&1 || true
+      "$DOCKER_BIN" rm -f $DOKKU_APP_CIDS >/dev/null 2>&1 || true
     fi
   fi
 }
diff --git a/plugins/scheduler-docker-local/scheduler-tags-create b/plugins/scheduler-docker-local/scheduler-tags-create
index c4c41d81d..5d04aa6f7 100755
--- a/plugins/scheduler-docker-local/scheduler-tags-create
+++ b/plugins/scheduler-docker-local/scheduler-tags-create
@@ -15,7 +15,7 @@ scheduler-docker-local-scheduler-tags-create() {
   local TAG_OPTS=""
   [[ $(is_tag_force_available) ]] && TAG_OPTS="-f"
   # shellcheck disable=SC2086
-  docker tag $TAG_OPTS "$SOURCE_IMAGE" "$TARGET_IMAGE"
+  "$DOCKER_BIN" tag $TAG_OPTS "$SOURCE_IMAGE" "$TARGET_IMAGE"
 }
 
 is_tag_force_available() {
diff --git a/plugins/scheduler-docker-local/scheduler-tags-destroy b/plugins/scheduler-docker-local/scheduler-tags-destroy
index 5c3ccfb1d..0fbaeab2f 100755
--- a/plugins/scheduler-docker-local/scheduler-tags-destroy
+++ b/plugins/scheduler-docker-local/scheduler-tags-destroy
@@ -12,7 +12,7 @@ scheduler-docker-local-scheduler-tags-destroy() {
     return
   fi
 
-  docker rmi "$IMAGE_REPO:$IMAGE_TAG"
+  "$DOCKER_BIN" rmi "$IMAGE_REPO:$IMAGE_TAG"
 }
 
 scheduler-docker-local-scheduler-tags-destroy "$@"
diff --git a/plugins/tags/subcommands/default b/plugins/tags/subcommands/default
index 1c3595123..7ccecf21e 100755
--- a/plugins/tags/subcommands/default
+++ b/plugins/tags/subcommands/default
@@ -12,7 +12,7 @@ tags_main_cmd() {
   verify_app_name "$APP"
 
   dokku_log_info2_quiet "Image tags for $IMAGE_REPO"
-  docker images "$IMAGE_REPO"
+  "$DOCKER_BIN" images "$IMAGE_REPO"
 }
 
 tags_main_cmd "$@"
diff --git a/tests/unit/40_report.bats b/tests/unit/40_report.bats
index a6daecec7..d4ddedfcb 100644
--- a/tests/unit/40_report.bats
+++ b/tests/unit/40_report.bats
@@ -5,9 +5,11 @@ load test_helper
 setup() {
   global_setup
   deploy_app
+  rm -f /tmp/fake-docker-bin
 }
 
 teardown() {
+  rm -f /tmp/fake-docker-bin
   destroy_app
   global_teardown
 }
@@ -46,3 +48,33 @@ teardown() {
 
   dokku --force apps:destroy "${TEST_APP}-2"
 }
+
+@test "(report) custom docker bin" {
+  export DOCKER_BIN="docker"
+  run /bin/bash -c "dokku report"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "herokuish version:"
+  assert_success
+
+  export DOCKER_BIN="/usr/bin/docker"
+  run /bin/bash -c "dokku report"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "herokuish version:"
+  assert_success
+
+  touch /tmp/fake-docker-bin
+  echo '#!/usr/bin/env bash' >/tmp/fake-docker-bin
+  echo '/usr/bin/docker "$@"' >>/tmp/fake-docker-bin
+  chmod +x /tmp/fake-docker-bin
+
+  export DOCKER_BIN="/tmp/fake-docker-bin"
+  run /bin/bash -c "dokku report"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "herokuish version:"
+  assert_success
+
+  unset DOCKER_BIN
+}

From 79d4f4578d2aa4aec22c3252c1691ffaaa651294 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 29 May 2019 00:45:36 -0400
Subject: [PATCH 135/163] fix: use correct method for executing dokku within
 tests

---
 tests/unit/20_nginx-vhosts_1.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/20_nginx-vhosts_1.bats b/tests/unit/20_nginx-vhosts_1.bats
index 8a5c8eeb3..c71d9bc55 100644
--- a/tests/unit/20_nginx-vhosts_1.bats
+++ b/tests/unit/20_nginx-vhosts_1.bats
@@ -136,7 +136,7 @@ teardown() {
   deploy_app
 
   create_attach_network
-  run dokku nginx:build-config "$TEST_APP"
+  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
   echo "output: "$output
   echo "status: "$status
   assert_success

From 8d526b964b2b1898102122d54fee012f6a42cd2b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 29 May 2019 01:28:50 -0400
Subject: [PATCH 136/163] Release 0.17.5

# History

## 0.17.5

Install/update via the bootstrap script:

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

### New Features

- #3576: @josegonzalez Allow setting DOCKER_BIN path for docker execution
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 3fc48af26..9e25fecba 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.17.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh
+sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh
+```
+
+### New Features
+
+- #3576: @josegonzalez Allow setting DOCKER_BIN path for docker execution
+
 ## 0.17.4
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index b9f8da37a..697f15804 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh
-sudo DOKKU_TAG=v0.17.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh
+sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 7b5460837..10778b0f3 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.4'
+VERSION = 'v0.17.5'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 0413df2f5..0c847f1f4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.4
+Version: 0.17.5
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 83026e1c4..18642c6ec 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.4 enabled    dokku core standard plugin
-  20_events            0.17.4 enabled    dokku core events logging plugin
-  apps                 0.17.4 enabled    dokku core apps plugin
-  build-env            0.17.4 enabled    dokku core build-env plugin
-  certs                0.17.4 enabled    dokku core certificate management plugin
-  checks               0.17.4 enabled    dokku core checks plugin
-  common               0.17.4 enabled    dokku core common plugin
-  config               0.17.4 enabled    dokku core config plugin
-  docker-options       0.17.4 enabled    dokku core docker-options plugin
-  domains              0.17.4 enabled    dokku core domains plugin
-  enter                0.17.4 enabled    dokku core enter plugin
-  git                  0.17.4 enabled    dokku core git plugin
-  logs                 0.17.4 enabled    dokku core logs plugin
-  named-containers     0.17.4 enabled    dokku core named containers plugin
-  network              0.17.4 enabled    dokku core network plugin
-  nginx-vhosts         0.17.4 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.4 enabled    dokku core plugin plugin
-  proxy                0.17.4 enabled    dokku core proxy plugin
-  ps                   0.17.4 enabled    dokku core ps plugin
-  repo                 0.17.4 enabled    dokku core repo plugin
-  shell                0.17.4 enabled    dokku core shell plugin
-  ssh-keys             0.17.4 enabled    dokku core ssh-keys plugin
-  storage              0.17.4 enabled    dokku core storage plugin
-  tags                 0.17.4 enabled    dokku core tags plugin
-  tar                  0.17.4 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.5 enabled    dokku core standard plugin
+  20_events            0.17.5 enabled    dokku core events logging plugin
+  apps                 0.17.5 enabled    dokku core apps plugin
+  build-env            0.17.5 enabled    dokku core build-env plugin
+  certs                0.17.5 enabled    dokku core certificate management plugin
+  checks               0.17.5 enabled    dokku core checks plugin
+  common               0.17.5 enabled    dokku core common plugin
+  config               0.17.5 enabled    dokku core config plugin
+  docker-options       0.17.5 enabled    dokku core docker-options plugin
+  domains              0.17.5 enabled    dokku core domains plugin
+  enter                0.17.5 enabled    dokku core enter plugin
+  git                  0.17.5 enabled    dokku core git plugin
+  logs                 0.17.5 enabled    dokku core logs plugin
+  named-containers     0.17.5 enabled    dokku core named containers plugin
+  network              0.17.5 enabled    dokku core network plugin
+  nginx-vhosts         0.17.5 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.5 enabled    dokku core plugin plugin
+  proxy                0.17.5 enabled    dokku core proxy plugin
+  ps                   0.17.5 enabled    dokku core ps plugin
+  repo                 0.17.5 enabled    dokku core repo plugin
+  shell                0.17.5 enabled    dokku core shell plugin
+  ssh-keys             0.17.5 enabled    dokku core ssh-keys plugin
+  storage              0.17.5 enabled    dokku core storage plugin
+  tags                 0.17.5 enabled    dokku core tags plugin
+  tar                  0.17.5 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index d0e452fe0..a84d3399f 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 8595c1f29..831de1778 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 907c08484..18c4b4361 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index dcaef01a1..2b4858fb3 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.4"
+    "0.17.5"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index ccde22264..9e5e36b86 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.4-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.5-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 97795dee5..7683f79c1 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index ca64a97a4..1631931a4 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.4/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.4 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 87355e9d2..3b1fdc2a1 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.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.17.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.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.17.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index f546363a2..7b173fc7d 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index e3eb303f2..160211469 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index fd6fdc2b6..aa112cb97 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 8df523667..ec8ea1ef8 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 0b74d1d3e..cb4c3817e 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 33cc7916a..995c687e7 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 788f209cd..a1d15c1c3 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index f09a58202..690f8f0ba 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index c2f8e345f..e8e00e6d5 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 82e74f21e..4b88040de 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 018c3a51c..8416e466c 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index fab381fb0..33f0b0ee6 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index c0ad08ee4..3edd94596 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 511fa7aff..b5ed3460d 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index a30f858b0..4b6d05941 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 00c55bc50..7c1e690e7 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 06d0a75bf..375bee158 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index c5736cb64..df26d063d 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index a4679ad57..9d9689f6e 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index e2f9fdd11..9353c5a10 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 60505ff29..7769f81c0 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index c499bd294..6d9a99d23 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 24f2bb97f..4c22b29ad 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 0a63ba8b9..355fc0e74 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 0b197d49e..f9a0a36ea 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index b4483b791..68926b367 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index ea751249d..06ae08a8c 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 91ebd8a08..a0d3d1ba6 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 8a8e3bed7..35e59a322 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.4"
+version = "0.17.5"
 [plugin.config]

From 5fd5e235d870718c1739dd5322d045eb9b5c5e91 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 30 May 2019 13:23:38 -0400
Subject: [PATCH 137/163] feat: allow omitting resource args by setting
 DOKKU_OMIT_RESOURCE_ARGS

This is useful for one-off containers that should have full-access to server resources.
---
 .../docker-args-process-deploy/docker-args-process-deploy.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
index 0b5636a5f..c8f8da8f9 100644
--- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
+++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go
@@ -21,6 +21,11 @@ func main() {
 	appName := flag.Arg(0)
 	processType := flag.Arg(3)
 
+	if os.Getenv("DOKKU_OMIT_RESOURCE_ARGS") == "1" {
+		fmt.Print(string(stdin))
+		return
+	}
+
 	resources, err := common.PropertyGetAll("resource", appName)
 	if err != nil {
 		fmt.Print(string(stdin))

From 8a5504574df5a8a9dce951d33b5b4b7e76de28bc Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 30 May 2019 17:40:21 -0400
Subject: [PATCH 138/163] Release 0.17.6

# History

## 0.17.6

Install/update via the bootstrap script:

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

### New Features

- #3578: @josegonzalez Allow omitting resource args by setting DOKKU_OMIT_RESOURCE_ARGS
---
 HISTORY.md                                 | 13 ++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 50 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 ++--
 docs/assets/favicons/manifest.json         | 12 +++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 ++++++++---------
 docs/template.html                         | 36 ++++++++--------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9e25fecba..4718d641c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # History
 
+## 0.17.6
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh
+sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh
+```
+
+### New Features
+
+- #3578: @josegonzalez Allow omitting resource args by setting DOKKU_OMIT_RESOURCE_ARGS
+
 ## 0.17.5
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 697f15804..70f1b8d01 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh
-sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh
+sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 10778b0f3..d3dfe2bbc 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.5'
+VERSION = 'v0.17.6'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 0c847f1f4..f92b073f6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.5
+Version: 0.17.6
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 18642c6ec..fb3efdaa3 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,31 +32,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.5 enabled    dokku core standard plugin
-  20_events            0.17.5 enabled    dokku core events logging plugin
-  apps                 0.17.5 enabled    dokku core apps plugin
-  build-env            0.17.5 enabled    dokku core build-env plugin
-  certs                0.17.5 enabled    dokku core certificate management plugin
-  checks               0.17.5 enabled    dokku core checks plugin
-  common               0.17.5 enabled    dokku core common plugin
-  config               0.17.5 enabled    dokku core config plugin
-  docker-options       0.17.5 enabled    dokku core docker-options plugin
-  domains              0.17.5 enabled    dokku core domains plugin
-  enter                0.17.5 enabled    dokku core enter plugin
-  git                  0.17.5 enabled    dokku core git plugin
-  logs                 0.17.5 enabled    dokku core logs plugin
-  named-containers     0.17.5 enabled    dokku core named containers plugin
-  network              0.17.5 enabled    dokku core network plugin
-  nginx-vhosts         0.17.5 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.5 enabled    dokku core plugin plugin
-  proxy                0.17.5 enabled    dokku core proxy plugin
-  ps                   0.17.5 enabled    dokku core ps plugin
-  repo                 0.17.5 enabled    dokku core repo plugin
-  shell                0.17.5 enabled    dokku core shell plugin
-  ssh-keys             0.17.5 enabled    dokku core ssh-keys plugin
-  storage              0.17.5 enabled    dokku core storage plugin
-  tags                 0.17.5 enabled    dokku core tags plugin
-  tar                  0.17.5 enabled    dokku core tar plugin
+  00_dokku-standard    0.17.6 enabled    dokku core standard plugin
+  20_events            0.17.6 enabled    dokku core events logging plugin
+  apps                 0.17.6 enabled    dokku core apps plugin
+  build-env            0.17.6 enabled    dokku core build-env plugin
+  certs                0.17.6 enabled    dokku core certificate management plugin
+  checks               0.17.6 enabled    dokku core checks plugin
+  common               0.17.6 enabled    dokku core common plugin
+  config               0.17.6 enabled    dokku core config plugin
+  docker-options       0.17.6 enabled    dokku core docker-options plugin
+  domains              0.17.6 enabled    dokku core domains plugin
+  enter                0.17.6 enabled    dokku core enter plugin
+  git                  0.17.6 enabled    dokku core git plugin
+  logs                 0.17.6 enabled    dokku core logs plugin
+  named-containers     0.17.6 enabled    dokku core named containers plugin
+  network              0.17.6 enabled    dokku core network plugin
+  nginx-vhosts         0.17.6 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.6 enabled    dokku core plugin plugin
+  proxy                0.17.6 enabled    dokku core proxy plugin
+  ps                   0.17.6 enabled    dokku core ps plugin
+  repo                 0.17.6 enabled    dokku core repo plugin
+  shell                0.17.6 enabled    dokku core shell plugin
+  ssh-keys             0.17.6 enabled    dokku core ssh-keys plugin
+  storage              0.17.6 enabled    dokku core storage plugin
+  tags                 0.17.6 enabled    dokku core tags plugin
+  tar                  0.17.6 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index a84d3399f..f8ffe836e 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 831de1778..e486f5138 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 18c4b4361..0952a2232 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 2b4858fb3..91c12a93e 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.5"
+    "0.17.6"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 9e5e36b86..7bcf86d78 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.5-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.6-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 7683f79c1..5930c97e9 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 1631931a4..3bebe3422 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.5/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.5 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 3b1fdc2a1..f8ddb6527 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 7b173fc7d..8baef61ae 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 160211469..f86653ebe 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index aa112cb97..cff741b62 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index ec8ea1ef8..eeebc94a3 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index cb4c3817e..d13ecc068 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 995c687e7..8a7f733c5 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index a1d15c1c3..4130fb1bd 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 690f8f0ba..02e492539 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index e8e00e6d5..23e9e5f4d 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 4b88040de..20f9d90fc 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 8416e466c..d300c0f58 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 33f0b0ee6..14894a72f 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 3edd94596..2faa2e041 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index b5ed3460d..8b63daf8d 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 4b6d05941..3c5daa9d2 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 7c1e690e7..7f9403bc0 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 375bee158..24ae11a65 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index df26d063d..ffc28b96c 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 9d9689f6e..4418d62c1 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index 9353c5a10..c07302488 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 7769f81c0..ce2ed79c6 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 6d9a99d23..f77529abd 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 4c22b29ad..12f9066a1 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 355fc0e74..ae0724f30 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index f9a0a36ea..baa04e4eb 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 68926b367..062ad751b 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index 06ae08a8c..a0bc97b62 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index a0d3d1ba6..e56581df4 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 35e59a322..73bf63f03 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.5"
+version = "0.17.6"
 [plugin.config]

From a17ed7981eb6e09ad314c7f4efa39f0ceb15d4ae Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Tue, 4 Jun 2019 07:48:45 +0900
Subject: [PATCH 139/163] Use `plugin:list` instead of deprecated `plugin`

---
 docs/advanced-usage/plugin-management.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index fb3efdaa3..c7928f331 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -24,10 +24,10 @@ dokku plugins-install
 
 ## Usage
 
-You can list all installed plugins using the `plugin` command:
+You can list all installed plugins using the `plugin:list` command:
 
 ```shell
-dokku plugin
+dokku plugin:list
 ```
 
 ```

From 73f5fde99d08e2f1448f37ed594256201889617a Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Tue, 4 Jun 2019 07:48:57 +0900
Subject: [PATCH 140/163] Update output of `plugin:list`

---
 docs/advanced-usage/plugin-management.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index c7928f331..ea279c262 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -34,8 +34,10 @@ dokku plugin:list
 plugn: dev
   00_dokku-standard    0.17.6 enabled    dokku core standard plugin
   20_events            0.17.6 enabled    dokku core events logging plugin
+  app-json             0.17.6 enabled    dokku core app-json plugin
   apps                 0.17.6 enabled    dokku core apps plugin
   build-env            0.17.6 enabled    dokku core build-env plugin
+  buildpacks           0.17.6 enabled    dokku core buildpacks plugin
   certs                0.17.6 enabled    dokku core certificate management plugin
   checks               0.17.6 enabled    dokku core checks plugin
   common               0.17.6 enabled    dokku core common plugin
@@ -45,18 +47,20 @@ plugn: dev
   enter                0.17.6 enabled    dokku core enter plugin
   git                  0.17.6 enabled    dokku core git plugin
   logs                 0.17.6 enabled    dokku core logs plugin
-  named-containers     0.17.6 enabled    dokku core named containers plugin
   network              0.17.6 enabled    dokku core network plugin
   nginx-vhosts         0.17.6 enabled    dokku core nginx-vhosts plugin
   plugin               0.17.6 enabled    dokku core plugin plugin
   proxy                0.17.6 enabled    dokku core proxy plugin
   ps                   0.17.6 enabled    dokku core ps plugin
   repo                 0.17.6 enabled    dokku core repo plugin
+  resource             0.17.6 enabled    dokku core resource plugin
+  scheduler-docker-local 0.17.6 enabled    dokku core scheduler-docker-local plugin
   shell                0.17.6 enabled    dokku core shell plugin
   ssh-keys             0.17.6 enabled    dokku core ssh-keys plugin
   storage              0.17.6 enabled    dokku core storage plugin
   tags                 0.17.6 enabled    dokku core tags plugin
   tar                  0.17.6 enabled    dokku core tar plugin
+  trace                0.17.6 enabled    dokku core trace 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.

From 737e4a5bf4184336bedf2658b88bf6563ac06cca Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 9 Jun 2019 11:02:46 -0400
Subject: [PATCH 141/163] docs: fix no-install-recommends documentation

[ci skip]
---
 docs/getting-started/advanced-installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/advanced-installation.md b/docs/getting-started/advanced-installation.md
index c72f7c332..ef030cd56 100644
--- a/docs/getting-started/advanced-installation.md
+++ b/docs/getting-started/advanced-installation.md
@@ -46,7 +46,7 @@ sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make
 
 ## Skipping Herokuish installation
 
-The Herokuish package is recommended but not required if not using Heroku buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
+The Herokuish package is recommended but not required if not using Heroku buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=" --no-install-recommends " bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
 
 ## Configuring an unattended installation
 

From fc5544ac7046f7e21ca89679380c415cf1d03404 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 10 Jun 2019 13:05:57 -0400
Subject: [PATCH 142/163] refactor: use a single method for running the ps:*all
 commands

This reduces the duplication at the cost of slightly more complexity.
---
 plugins/ps/functions              |  7 +++++
 plugins/ps/internal-functions     | 51 +++++++++++++++++++++++++++++++
 plugins/ps/subcommands/rebuildall | 29 ++----------------
 plugins/ps/subcommands/restartall | 29 ++----------------
 plugins/ps/subcommands/restore    | 39 +++--------------------
 plugins/ps/subcommands/startall   | 29 ++----------------
 plugins/ps/subcommands/stopall    | 29 ++----------------
 7 files changed, 70 insertions(+), 143 deletions(-)

diff --git a/plugins/ps/functions b/plugins/ps/functions
index ba4e7546d..fe0cb0ca4 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -118,6 +118,13 @@ set_scale() {
   done
 }
 
+ps_restore() {
+  declare desc="restores app"
+  local APP="$1"
+
+  ps_start "$APP"
+}
+
 ps_start() {
   declare desc="starts app"
   local APP="$1"
diff --git a/plugins/ps/internal-functions b/plugins/ps/internal-functions
index c618041e8..e18661e07 100755
--- a/plugins/ps/internal-functions
+++ b/plugins/ps/internal-functions
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
@@ -117,3 +118,53 @@ cmd-ps-report-single() {
     fi
   fi
 }
+
+fn-ps-parallel-cmd() {
+  declare desc="Run a ps command against all apps"
+  declare CMD="$1"
+  local GNU_PARALLEL has_apps=false
+
+  for APP in $(dokku_apps); do
+    has_apps=true
+    break
+  done
+
+  if [[ "$has_apps" == "false" ]]; then
+    dokku_log_info1 "No apps detected"
+    return
+  fi
+
+  if which parallel >/dev/null 2>&1; then
+    dokku_log_info1 "Running 'dokku ps:${CMD}' in parallel"
+    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
+    if [[ -z "$GNU_PARALLEL" ]]; then
+      # shellcheck disable=SC2046
+      parallel -i bash -c "dokku ps:${CMD} {}" -- $(dokku_apps)
+    else
+      # shellcheck disable=SC2046
+      dokku_apps | parallel "dokku ps:${CMD} {}"
+    fi
+    return
+  fi
+
+  dokku_log_info1 "Running 'dokku ps:${CMD}' in serially"
+  for APP in $(dokku_apps); do
+    if ! (is_deployed "$APP"); then
+      dokku_log_warn "App $APP has not been deployed"
+      continue
+    fi
+
+    if [[ "$CMD" == "restore" ]]; then
+      local DOKKU_APP_RESTORE=$(config_get "$APP" DOKKU_APP_RESTORE || true)
+      if [[ "$DOKKU_APP_RESTORE" == 0 ]]; then
+        continue
+      fi
+    fi
+
+    dokku_log_verbose "Running 'dokku ps:${CMD} $APP' ..."
+    if ps_${CMD} "$APP"; then
+      continue
+    fi
+    dokku_log_warn "dokku ps:${CMD} $APP failed"
+  done
+}
diff --git a/plugins/ps/subcommands/rebuildall b/plugins/ps/subcommands/rebuildall
index 3f10e32a8..9390f1e0d 100755
--- a/plugins/ps/subcommands/rebuildall
+++ b/plugins/ps/subcommands/rebuildall
@@ -2,38 +2,13 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 ps_rebuildall_cmd() {
   declare desc="rebuilds all apps from source"
   local cmd="ps:rebuildall"
-  local GNU_PARALLEL
 
-  if which parallel >/dev/null 2>&1; then
-    dokku_log_info1 "Rebuilding in parallel"
-    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
-    if [[ -z "$GNU_PARALLEL" ]]; then
-      # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:rebuild {}" -- $(dokku_apps)
-    else
-      dokku_apps | parallel 'dokku ps:rebuild {}'
-    fi
-    return
-  fi
-
-  for app in $(dokku_apps); do
-    if ! (is_deployed "$app"); then
-      dokku_log_warn "App $app has not been deployed"
-      continue
-    fi
-
-    dokku_log_verbose "Rebuilding app $app ..."
-    if ps_rebuild "$app"; then
-      continue
-    fi
-    dokku_log_warn "dokku ps:rebuild ${app} failed"
-  done
+  fn-ps-parallel-cmd "rebuild"
 }
 
 ps_rebuildall_cmd "$@"
diff --git a/plugins/ps/subcommands/restartall b/plugins/ps/subcommands/restartall
index 19a4be7b6..07a8e2a53 100755
--- a/plugins/ps/subcommands/restartall
+++ b/plugins/ps/subcommands/restartall
@@ -2,38 +2,13 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 ps_restartall_cmd() {
   declare desc="restarts all apps via command line"
   local cmd="ps:restartall"
-  local GNU_PARALLEL
 
-  if which parallel >/dev/null 2>&1; then
-    dokku_log_info1 "Restarting in parallel"
-    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
-    if [[ -z "$GNU_PARALLEL" ]]; then
-      # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:restart {}" -- $(dokku_apps)
-    else
-      dokku_apps | parallel 'dokku ps:restart {}'
-    fi
-    return
-  fi
-
-  for app in $(dokku_apps); do
-    if ! (is_deployed "$app"); then
-      dokku_log_warn "App $app has not been deployed"
-      continue
-    fi
-
-    dokku_log_verbose "Restarting app $app ..."
-    if ps_restart "$app"; then
-      continue
-    fi
-    dokku_log_warn "dokku ps:restart ${app} failed"
-  done
+  fn-ps-parallel-cmd "restart"
 }
 
 ps_restartall_cmd "$@"
diff --git a/plugins/ps/subcommands/restore b/plugins/ps/subcommands/restore
index 94f84206a..d8b43b514 100755
--- a/plugins/ps/subcommands/restore
+++ b/plugins/ps/subcommands/restore
@@ -4,6 +4,7 @@ set -eo pipefail
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 ps_restore_cmd() {
   declare desc="starts all apps with DOKKU_APP_RESTORE not set to 0 via command line"
@@ -12,7 +13,7 @@ ps_restore_cmd() {
   local DOKKU_SCHEDULER
 
   DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
-  plugn trigger pre-restore "$DOKKU_SCHEDULER"
+  plugn trigger pre-restore "$DOKKU_SCHEDULER" "$APP"
 
   if [[ -n "$APP" ]]; then
     if ! (is_deployed "$APP"); then
@@ -22,43 +23,11 @@ ps_restore_cmd() {
 
     DOKKU_APP_RESTORE="$(config_get "$APP" DOKKU_APP_RESTORE || true)"
     if [[ $DOKKU_APP_RESTORE != 0 ]]; then
-      ps_start "$APP" || dokku_log_warn "dokku ps:restore ${APP} failed"
+      ps_restore "$APP" || dokku_log_warn "dokku ps:restore ${APP} failed"
     fi
   else
-    ps_restore_all
+    fn-ps-parallel-cmd "restore"
   fi
 }
 
-ps_restore_all() {
-  local GNU_PARALLEL
-
-  if which parallel >/dev/null 2>&1; then
-    dokku_log_info1 "Restarting in parallel"
-    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
-    if [[ -z "$GNU_PARALLEL" ]]; then
-      # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:restore {}" -- $(dokku_apps)
-    else
-      dokku_apps | parallel 'dokku ps:restore {}'
-    fi
-    return
-  fi
-
-  for app in $(dokku_apps); do
-    if ! (is_deployed "$app"); then
-      dokku_log_warn "App $app has not been deployed"
-      continue
-    fi
-
-    local DOKKU_APP_RESTORE=$(config_get "$app" DOKKU_APP_RESTORE || true)
-    if [[ $DOKKU_APP_RESTORE != 0 ]]; then
-      dokku_log_verbose "Restoring app $app ..."
-      if ps_start "$app"; then
-        continue
-      fi
-      dokku_log_warn "dokku ps:restore ${app} failed"
-    fi
-  done
-}
-
 ps_restore_cmd "$@"
diff --git a/plugins/ps/subcommands/startall b/plugins/ps/subcommands/startall
index 13841486e..0ccb7234c 100755
--- a/plugins/ps/subcommands/startall
+++ b/plugins/ps/subcommands/startall
@@ -2,38 +2,13 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 ps_startall_cmd() {
   declare desc="starts all apps via command line"
   local cmd="ps:startall"
-  local GNU_PARALLEL
 
-  if which parallel >/dev/null 2>&1; then
-    dokku_log_info1 "Starting in parallel"
-    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
-    if [[ -z "$GNU_PARALLEL" ]]; then
-      # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:start {}" -- $(dokku_apps)
-    else
-      dokku_apps | parallel 'dokku ps:start {}'
-    fi
-    return
-  fi
-
-  for app in $(dokku_apps); do
-    if ! (is_deployed "$app"); then
-      dokku_log_warn "App $app has not been deployed"
-      continue
-    fi
-
-    dokku_log_verbose "Starting app $app ..."
-    if ps_start "$app"; then
-      continue
-    fi
-    dokku_log_warn "dokku ps:start ${app} failed"
-  done
+  fn-ps-parallel-cmd "start"
 }
 
 ps_startall_cmd "$@"
diff --git a/plugins/ps/subcommands/stopall b/plugins/ps/subcommands/stopall
index 3014ef189..decef1c98 100755
--- a/plugins/ps/subcommands/stopall
+++ b/plugins/ps/subcommands/stopall
@@ -2,38 +2,13 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 ps_stopall_cmd() {
   declare desc="stops all apps via command line"
   local cmd="ps:stopall"
-  local GNU_PARALLEL
 
-  if which parallel >/dev/null 2>&1; then
-    dokku_log_info1 "Stopping in parallel"
-    GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
-    if [[ -z "$GNU_PARALLEL" ]]; then
-      # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:stop {}" -- $(dokku_apps)
-    else
-      dokku_apps | parallel 'dokku ps:stop {}'
-    fi
-    return
-  fi
-
-  for app in $(dokku_apps); do
-    if ! (is_deployed "$app"); then
-      dokku_log_warn "App $app has not been deployed"
-      continue
-    fi
-
-    dokku_log_verbose "Stopping app $app ..."
-    if ps_stop "$app"; then
-      continue
-    fi
-    dokku_log_warn "dokku ps:stop ${app} failed"
-  done
+  fn-ps-parallel-cmd "stop"
 }
 
 ps_stopall_cmd "$@"

From 0ebb400d91eab7203752662ea5212ed3c455a033 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 10 Jun 2019 13:07:23 -0400
Subject: [PATCH 143/163] feat: allow users to specify custom parallel
 arguments

---
 docs/configuration/environment-variables.md | 1 +
 plugins/ps/internal-functions               | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/environment-variables.md b/docs/configuration/environment-variables.md
index d0c7c7c7c..6d8b266a5 100644
--- a/docs/configuration/environment-variables.md
+++ b/docs/configuration/environment-variables.md
@@ -114,6 +114,7 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_DOCKERFILE_ENTRYPOINT`  | dockerfile entrypoint           | `dokku config:set`                                                                                                                               | |
 | `DOKKU_DOCKERFILE_PORTS`       | dockerfile ports                | `dokku config:set`                                                                                                                               | |
 | `DOKKU_DOCKERFILE_START_CMD`   | none                            | `dokku config:set`                                                                                                                               | |
+| `DOKKU_PARALLEL_ARGUMENTS`.    | none                            | `dokku config:set`                                                                                                                               | Allows passing custom arguments to parallel for `ps:*all` commands |
 | `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`                                                             | |
diff --git a/plugins/ps/internal-functions b/plugins/ps/internal-functions
index e18661e07..dc816f641 100755
--- a/plugins/ps/internal-functions
+++ b/plugins/ps/internal-functions
@@ -139,10 +139,10 @@ fn-ps-parallel-cmd() {
     GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
     if [[ -z "$GNU_PARALLEL" ]]; then
       # shellcheck disable=SC2046
-      parallel -i bash -c "dokku ps:${CMD} {}" -- $(dokku_apps)
+      parallel $DOKKU_PARALLEL_ARGUMENTS -i bash -c "dokku ps:${CMD} {}" -- $(dokku_apps)
     else
       # shellcheck disable=SC2046
-      dokku_apps | parallel "dokku ps:${CMD} {}"
+      dokku_apps | parallel $DOKKU_PARALLEL_ARGUMENTS "dokku ps:${CMD} {}"
     fi
     return
   fi

From 283ff056da5f5f6181646ae6bf8a63201fb7514a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 10 Jun 2019 16:06:24 -0400
Subject: [PATCH 144/163] Release 0.17.7

# History

## 0.17.7

Install/update via the bootstrap script:

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

### New Features

- #3586: @josegonzalez ps plugin parallel usage cleanup

### Documentation

- #3584: @josegonzalez Fix no-install-recommends documentation

### Other

- #3579: @znz Update plugin list
---
 HISTORY.md                                 | 21 ++++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 58 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 +--
 docs/assets/favicons/manifest.json         | 12 ++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 +++++++--------
 docs/template.html                         | 36 +++++++-------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 137 insertions(+), 116 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 4718d641c..b8c8ad4c4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,26 @@
 # History
 
+## 0.17.7
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh
+sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh
+```
+
+### New Features
+
+- #3586: @josegonzalez ps plugin parallel usage cleanup
+
+### Documentation
+
+- #3584: @josegonzalez Fix no-install-recommends documentation
+
+### Other
+
+- #3579: @znz Update plugin list
+
 ## 0.17.6
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index 70f1b8d01..a2ed76ebf 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh
-sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh
+sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index d3dfe2bbc..49624da9a 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.6'
+VERSION = 'v0.17.7'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index f92b073f6..d307a7958 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.6
+Version: 0.17.7
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index ea279c262..3ab099871 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,35 +32,35 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.6 enabled    dokku core standard plugin
-  20_events            0.17.6 enabled    dokku core events logging plugin
-  app-json             0.17.6 enabled    dokku core app-json plugin
-  apps                 0.17.6 enabled    dokku core apps plugin
-  build-env            0.17.6 enabled    dokku core build-env plugin
-  buildpacks           0.17.6 enabled    dokku core buildpacks plugin
-  certs                0.17.6 enabled    dokku core certificate management plugin
-  checks               0.17.6 enabled    dokku core checks plugin
-  common               0.17.6 enabled    dokku core common plugin
-  config               0.17.6 enabled    dokku core config plugin
-  docker-options       0.17.6 enabled    dokku core docker-options plugin
-  domains              0.17.6 enabled    dokku core domains plugin
-  enter                0.17.6 enabled    dokku core enter plugin
-  git                  0.17.6 enabled    dokku core git plugin
-  logs                 0.17.6 enabled    dokku core logs plugin
-  network              0.17.6 enabled    dokku core network plugin
-  nginx-vhosts         0.17.6 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.6 enabled    dokku core plugin plugin
-  proxy                0.17.6 enabled    dokku core proxy plugin
-  ps                   0.17.6 enabled    dokku core ps plugin
-  repo                 0.17.6 enabled    dokku core repo plugin
-  resource             0.17.6 enabled    dokku core resource plugin
-  scheduler-docker-local 0.17.6 enabled    dokku core scheduler-docker-local plugin
-  shell                0.17.6 enabled    dokku core shell plugin
-  ssh-keys             0.17.6 enabled    dokku core ssh-keys plugin
-  storage              0.17.6 enabled    dokku core storage plugin
-  tags                 0.17.6 enabled    dokku core tags plugin
-  tar                  0.17.6 enabled    dokku core tar plugin
-  trace                0.17.6 enabled    dokku core trace plugin
+  00_dokku-standard    0.17.7 enabled    dokku core standard plugin
+  20_events            0.17.7 enabled    dokku core events logging plugin
+  app-json             0.17.7 enabled    dokku core app-json plugin
+  apps                 0.17.7 enabled    dokku core apps plugin
+  build-env            0.17.7 enabled    dokku core build-env plugin
+  buildpacks           0.17.7 enabled    dokku core buildpacks plugin
+  certs                0.17.7 enabled    dokku core certificate management plugin
+  checks               0.17.7 enabled    dokku core checks plugin
+  common               0.17.7 enabled    dokku core common plugin
+  config               0.17.7 enabled    dokku core config plugin
+  docker-options       0.17.7 enabled    dokku core docker-options plugin
+  domains              0.17.7 enabled    dokku core domains plugin
+  enter                0.17.7 enabled    dokku core enter plugin
+  git                  0.17.7 enabled    dokku core git plugin
+  logs                 0.17.7 enabled    dokku core logs plugin
+  network              0.17.7 enabled    dokku core network plugin
+  nginx-vhosts         0.17.7 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.7 enabled    dokku core plugin plugin
+  proxy                0.17.7 enabled    dokku core proxy plugin
+  ps                   0.17.7 enabled    dokku core ps plugin
+  repo                 0.17.7 enabled    dokku core repo plugin
+  resource             0.17.7 enabled    dokku core resource plugin
+  scheduler-docker-local 0.17.7 enabled    dokku core scheduler-docker-local plugin
+  shell                0.17.7 enabled    dokku core shell plugin
+  ssh-keys             0.17.7 enabled    dokku core ssh-keys plugin
+  storage              0.17.7 enabled    dokku core storage plugin
+  tags                 0.17.7 enabled    dokku core tags plugin
+  tar                  0.17.7 enabled    dokku core tar plugin
+  trace                0.17.7 enabled    dokku core trace 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index f8ffe836e..94ab05305 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index e486f5138..55a7256de 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 0952a2232..55b027dfb 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index 91c12a93e..c17709459 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.6"
+    "0.17.7"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 7bcf86d78..962714b13 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.6-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.7-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 5930c97e9..039dfb510 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 3bebe3422..d1bb76b77 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.6/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.6 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index f8ddb6527..a743ee783 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.6/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 8baef61ae..0fd4b2967 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index f86653ebe..16628a9b8 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index cff741b62..35b67f728 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index eeebc94a3..732bfdf63 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index d13ecc068..8e036726b 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 8a7f733c5..b8fe3c828 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index 4130fb1bd..c5a83091c 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 02e492539..f4f524fe9 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 23e9e5f4d..5de3af30a 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 20f9d90fc..361148c77 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index d300c0f58..40dba92ff 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 14894a72f..c5b0a00d6 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 2faa2e041..d28e4d567 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 8b63daf8d..45cc31afb 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 3c5daa9d2..006fa02e8 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 7f9403bc0..eec243052 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 24ae11a65..0a516170a 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index ffc28b96c..2ce22205a 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 4418d62c1..6ce3a3865 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index c07302488..a429bfc82 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index ce2ed79c6..7af7ad19b 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index f77529abd..077e921a3 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 12f9066a1..8745d2aae 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index ae0724f30..e62272355 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index baa04e4eb..2e2094e64 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 062ad751b..3b6f745af 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index a0bc97b62..db46b0ac6 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index e56581df4..87df37d86 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 73bf63f03..22d0b1f92 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.6"
+version = "0.17.7"
 [plugin.config]

From 2cabf0a21fe17d27e81225b94dbb6498bd3f7d7c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 10 Jun 2019 16:03:06 -0400
Subject: [PATCH 145/163] feat: drop make and gcc as dependencies

They aren't actually used within Dokku.
---
 debian/control | 2 +-
 rpm.mk         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d307a7958..38d6eecd4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Version: 0.17.7
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.7.1) | docker-engine (>= 1.7.1) | docker-io (>= 1.7.1)  | docker.io (>= 1.7.1) | docker-ce | docker-ee, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog
+Depends: locales, git, curl, 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>
diff --git a/rpm.mk b/rpm.mk
index ddb7fe073..02dca57ea 100644
--- a/rpm.mk
+++ b/rpm.mk
@@ -63,10 +63,8 @@ endif
 		--depends '/usr/bin/docker' \
 		--depends 'bind-utils' \
 		--depends 'curl' \
-		--depends 'gcc' \
 		--depends 'git' \
 		--depends 'gliderlabs-sigil' \
-		--depends 'make' \
 		--depends 'man-db' \
 		--depends 'nc' \
 		--depends 'nginx >= 1.8.0' \

From a848d92823ffab898220045616f2d5529c967810 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Wed, 12 Jun 2019 22:16:02 +0100
Subject: [PATCH 146/163] Allow SSH keys with no ending newline (fixes #3590)

---
 plugins/ssh-keys/subcommands/add | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index dd3ba7afc..b6fa76bce 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -29,7 +29,8 @@ add_keys() {
   fi
 
   local count="$(wc -l "$KEY_FILE" | awk '{ print $1; }')"
-  [[ "$count" -eq 1 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
+  # Don't check for "-eq 1" as no newlines is also a valid SSH key
+  [[ "$count" -lt 2 ]] || dokku_log_fail "Too many keys provided, set one per invocation of dokku ssh-keys:add <NAME> <KEY_FILE>"
   ssh-keygen -lf "$KEY_FILE" &>/dev/null || dokku_log_fail "Key specified in is not a valid ssh public key"
   create_ssh_key_file
   verify_ssh_key_exists

From 024fd958e86430f4c5d35e42933d56dab7eb6134 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Wed, 12 Jun 2019 22:30:26 +0100
Subject: [PATCH 147/163] Add no-newline SSH key test

---
 tests/unit/30_ssh_keys.bats | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/unit/30_ssh_keys.bats b/tests/unit/30_ssh_keys.bats
index 3b23aefea..b024a9427 100644
--- a/tests/unit/30_ssh_keys.bats
+++ b/tests/unit/30_ssh_keys.bats
@@ -13,6 +13,9 @@ setup() {
   # now create key that will be really used
   create_key
 
+  # Test key without a trailing newline
+  echo -n "$KEY" > /tmp/testkey-no-newline.pub
+
   # the temporary key is useful for adding in the file with two keys
   # useful for a negative test
   { cat /tmp/testkey.pub ; echo "$KEY" ; } > /tmp/testkey-double.pub
@@ -70,6 +73,10 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+  run /bin/bash -c "dokku ssh-keys:add name5 /tmp/testkey-no-newline.pub"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
 
   # leave this as the last test in the sequence! It introduces an error in authorized_keys
   run /bin/bash -c 'echo invalid >> "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys"'

From 161380d639f329cd202d3edd88a1cd808693e915 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 14 Jun 2019 12:59:57 -0500
Subject: [PATCH 148/163] Release 0.17.8

# History

## 0.17.8

Install/update via the bootstrap script:

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

### Bug Fixes

- #3591: @palfrey Allow SSH keys with no ending newline

### New Features

- #3587: @josegonzalez feat: drop make and gcc as dependencies
---
 HISTORY.md                                 | 17 +++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 58 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 +--
 docs/assets/favicons/manifest.json         | 12 ++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 +++++++--------
 docs/template.html                         | 36 +++++++-------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 133 insertions(+), 116 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index b8c8ad4c4..5305f5e15 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,22 @@
 # History
 
+## 0.17.8
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh
+sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3591: @palfrey Allow SSH keys with no ending newline
+
+### New Features
+
+- #3587: @josegonzalez feat: drop make and gcc as dependencies
+
 ## 0.17.7
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index a2ed76ebf..b64300740 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh
-sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh
+sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index 49624da9a..e919cb69a 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.7'
+VERSION = 'v0.17.8'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index 38d6eecd4..ab07f55b6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.7
+Version: 0.17.8
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 3ab099871..8ef99ec4f 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,35 +32,35 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.7 enabled    dokku core standard plugin
-  20_events            0.17.7 enabled    dokku core events logging plugin
-  app-json             0.17.7 enabled    dokku core app-json plugin
-  apps                 0.17.7 enabled    dokku core apps plugin
-  build-env            0.17.7 enabled    dokku core build-env plugin
-  buildpacks           0.17.7 enabled    dokku core buildpacks plugin
-  certs                0.17.7 enabled    dokku core certificate management plugin
-  checks               0.17.7 enabled    dokku core checks plugin
-  common               0.17.7 enabled    dokku core common plugin
-  config               0.17.7 enabled    dokku core config plugin
-  docker-options       0.17.7 enabled    dokku core docker-options plugin
-  domains              0.17.7 enabled    dokku core domains plugin
-  enter                0.17.7 enabled    dokku core enter plugin
-  git                  0.17.7 enabled    dokku core git plugin
-  logs                 0.17.7 enabled    dokku core logs plugin
-  network              0.17.7 enabled    dokku core network plugin
-  nginx-vhosts         0.17.7 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.7 enabled    dokku core plugin plugin
-  proxy                0.17.7 enabled    dokku core proxy plugin
-  ps                   0.17.7 enabled    dokku core ps plugin
-  repo                 0.17.7 enabled    dokku core repo plugin
-  resource             0.17.7 enabled    dokku core resource plugin
-  scheduler-docker-local 0.17.7 enabled    dokku core scheduler-docker-local plugin
-  shell                0.17.7 enabled    dokku core shell plugin
-  ssh-keys             0.17.7 enabled    dokku core ssh-keys plugin
-  storage              0.17.7 enabled    dokku core storage plugin
-  tags                 0.17.7 enabled    dokku core tags plugin
-  tar                  0.17.7 enabled    dokku core tar plugin
-  trace                0.17.7 enabled    dokku core trace plugin
+  00_dokku-standard    0.17.8 enabled    dokku core standard plugin
+  20_events            0.17.8 enabled    dokku core events logging plugin
+  app-json             0.17.8 enabled    dokku core app-json plugin
+  apps                 0.17.8 enabled    dokku core apps plugin
+  build-env            0.17.8 enabled    dokku core build-env plugin
+  buildpacks           0.17.8 enabled    dokku core buildpacks plugin
+  certs                0.17.8 enabled    dokku core certificate management plugin
+  checks               0.17.8 enabled    dokku core checks plugin
+  common               0.17.8 enabled    dokku core common plugin
+  config               0.17.8 enabled    dokku core config plugin
+  docker-options       0.17.8 enabled    dokku core docker-options plugin
+  domains              0.17.8 enabled    dokku core domains plugin
+  enter                0.17.8 enabled    dokku core enter plugin
+  git                  0.17.8 enabled    dokku core git plugin
+  logs                 0.17.8 enabled    dokku core logs plugin
+  network              0.17.8 enabled    dokku core network plugin
+  nginx-vhosts         0.17.8 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.8 enabled    dokku core plugin plugin
+  proxy                0.17.8 enabled    dokku core proxy plugin
+  ps                   0.17.8 enabled    dokku core ps plugin
+  repo                 0.17.8 enabled    dokku core repo plugin
+  resource             0.17.8 enabled    dokku core resource plugin
+  scheduler-docker-local 0.17.8 enabled    dokku core scheduler-docker-local plugin
+  shell                0.17.8 enabled    dokku core shell plugin
+  ssh-keys             0.17.8 enabled    dokku core ssh-keys plugin
+  storage              0.17.8 enabled    dokku core storage plugin
+  tags                 0.17.8 enabled    dokku core tags plugin
+  tar                  0.17.8 enabled    dokku core tar plugin
+  trace                0.17.8 enabled    dokku core trace 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index 94ab05305..a1a2a1778 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 55a7256de..9274fd9b0 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.7\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 55b027dfb..4b2a9c0c4 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index c17709459..bf3455a43 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.7"
+    "0.17.8"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 962714b13..01fc9cea4 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.7-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.8-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 039dfb510..bc2a8846e 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index d1bb76b77..67b47fd99 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.7/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.7 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index a743ee783..881ebfcde 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.7/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 0fd4b2967..2b78c3ac4 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 16628a9b8..508a91193 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index 35b67f728..ddb6e6a50 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 732bfdf63..43700762e 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index 8e036726b..d5a5ba56e 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index b8fe3c828..1c47b0f40 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index c5a83091c..dd67090d1 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index f4f524fe9..3724d7c56 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index 5de3af30a..a08e9588f 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 361148c77..38d84c277 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 40dba92ff..91edc5d42 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index c5b0a00d6..1e2db6e3d 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index d28e4d567..292f1eed7 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 45cc31afb..73a14496f 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 006fa02e8..7d85ee2fa 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index eec243052..97ae03f10 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index 0a516170a..c1a23c3a2 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 2ce22205a..774878360 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 6ce3a3865..484c51f99 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index a429bfc82..cd473e9f1 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index 7af7ad19b..a3b7cd8cd 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 077e921a3..53ca5d9e4 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 8745d2aae..15ed1726b 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index e62272355..1059bc654 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 2e2094e64..74b15a806 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index 3b6f745af..dd556169e 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index db46b0ac6..a79be92f7 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 87df37d86..185080eb2 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 22d0b1f92..8818eaf70 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.7"
+version = "0.17.8"
 [plugin.config]

From 4e4e256a2774621223efa168809848adc826c950 Mon Sep 17 00:00:00 2001
From: JakeAngell <jakeangell@hotmail.com>
Date: Mon, 17 Jun 2019 21:21:10 +0100
Subject: [PATCH 149/163] Update nginx.conf.sigil

---
 plugins/nginx-vhosts/templates/nginx.conf.sigil | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil
index 59e902ba9..929538c12 100644
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -84,7 +84,7 @@ server {
     {{ if eq $.HTTP2_PUSH_SUPPORTED "true" }}http2_push_preload on; {{ end }}
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $http_connection;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Forwarded-For $remote_addr;

From 2d47931cc41ff38ca37f1d9cc3e55e4f1c294639 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 18 Jun 2019 12:27:43 -0400
Subject: [PATCH 150/163] docs: drop extra help output for trace

Closes #3594

[ci skip]
---
 plugins/00_dokku-standard/commands | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 551d5a405..871a2854b 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -10,7 +10,6 @@ case "$1" in
       declare desc="return standard plugin help content"
       cat <<help_content
     run [--env KEY=VALUE] <app> <cmd>, Run a command in a new container using the current application image
-    trace [on/off], Enable dokku tracing
     url <app>, Show the first URL for an application (compatibility)
     urls <app>, Show all URLs for an application
     version , Print dokku's version

From 48484732a0bdc2b6e384b5e331196e2f1c6afa45 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 18 Jun 2019 12:32:49 -0400
Subject: [PATCH 151/163] Release 0.17.9

# History

## 0.17.9

Install/update via the bootstrap script:

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

### Bug Fixes

- #3593: @JakeAngell Fix nginx template for https in "Connection" header

### Documentation

- #3595: @josegonzalez Drop extra help output for trace
---
 HISTORY.md                                 | 17 +++++++
 README.md                                  |  4 +-
 contrib/dokku-installer.py                 |  2 +-
 debian/control                             |  2 +-
 docs/advanced-usage/plugin-management.md   | 58 +++++++++++-----------
 docs/assets/favicons/browserconfig.xml     |  8 +--
 docs/assets/favicons/manifest.json         | 12 ++---
 docs/assets/style.css                      |  4 +-
 docs/assets/versions.json                  |  2 +-
 docs/development/release-process.md        |  2 +-
 docs/getting-started/installation.md       |  4 +-
 docs/home.html                             | 40 +++++++--------
 docs/template.html                         | 36 +++++++-------
 plugins/00_dokku-standard/plugin.toml      |  2 +-
 plugins/20_events/plugin.toml              |  2 +-
 plugins/app-json/plugin.toml               |  2 +-
 plugins/apps/plugin.toml                   |  2 +-
 plugins/build-env/plugin.toml              |  2 +-
 plugins/buildpacks/plugin.toml             |  2 +-
 plugins/certs/plugin.toml                  |  2 +-
 plugins/checks/plugin.toml                 |  2 +-
 plugins/common/plugin.toml                 |  2 +-
 plugins/config/plugin.toml                 |  2 +-
 plugins/docker-options/plugin.toml         |  2 +-
 plugins/domains/plugin.toml                |  2 +-
 plugins/enter/plugin.toml                  |  2 +-
 plugins/git/plugin.toml                    |  2 +-
 plugins/logs/plugin.toml                   |  2 +-
 plugins/network/plugin.toml                |  2 +-
 plugins/nginx-vhosts/plugin.toml           |  2 +-
 plugins/plugin/plugin.toml                 |  2 +-
 plugins/proxy/plugin.toml                  |  2 +-
 plugins/ps/plugin.toml                     |  2 +-
 plugins/repo/plugin.toml                   |  2 +-
 plugins/resource/plugin.toml               |  2 +-
 plugins/scheduler-docker-local/plugin.toml |  2 +-
 plugins/shell/plugin.toml                  |  2 +-
 plugins/ssh-keys/plugin.toml               |  2 +-
 plugins/storage/plugin.toml                |  2 +-
 plugins/tags/plugin.toml                   |  2 +-
 plugins/tar/plugin.toml                    |  2 +-
 plugins/trace/plugin.toml                  |  2 +-
 42 files changed, 133 insertions(+), 116 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 5305f5e15..636061590 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,22 @@
 # History
 
+## 0.17.9
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.9/bootstrap.sh
+sudo DOKKU_TAG=v0.17.9 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3593: @JakeAngell Fix nginx template for https in "Connection" header
+
+### Documentation
+
+- #3595: @josegonzalez Drop extra help output for trace
+
 ## 0.17.8
 
 Install/update via the bootstrap script:
diff --git a/README.md b/README.md
index b64300740..6bb64accd 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh
-sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.9/bootstrap.sh
+sudo DOKKU_TAG=v0.17.9 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py
index e919cb69a..07065d895 100755
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.17.8'
+VERSION = 'v0.17.9'
 
 hostname = ''
 try:
diff --git a/debian/control b/debian/control
index ab07f55b6..0dde0157d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.17.8
+Version: 0.17.9
 Section: web
 Priority: optional
 Architecture: amd64
diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md
index 8ef99ec4f..e49f20393 100644
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,35 +32,35 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.17.8 enabled    dokku core standard plugin
-  20_events            0.17.8 enabled    dokku core events logging plugin
-  app-json             0.17.8 enabled    dokku core app-json plugin
-  apps                 0.17.8 enabled    dokku core apps plugin
-  build-env            0.17.8 enabled    dokku core build-env plugin
-  buildpacks           0.17.8 enabled    dokku core buildpacks plugin
-  certs                0.17.8 enabled    dokku core certificate management plugin
-  checks               0.17.8 enabled    dokku core checks plugin
-  common               0.17.8 enabled    dokku core common plugin
-  config               0.17.8 enabled    dokku core config plugin
-  docker-options       0.17.8 enabled    dokku core docker-options plugin
-  domains              0.17.8 enabled    dokku core domains plugin
-  enter                0.17.8 enabled    dokku core enter plugin
-  git                  0.17.8 enabled    dokku core git plugin
-  logs                 0.17.8 enabled    dokku core logs plugin
-  network              0.17.8 enabled    dokku core network plugin
-  nginx-vhosts         0.17.8 enabled    dokku core nginx-vhosts plugin
-  plugin               0.17.8 enabled    dokku core plugin plugin
-  proxy                0.17.8 enabled    dokku core proxy plugin
-  ps                   0.17.8 enabled    dokku core ps plugin
-  repo                 0.17.8 enabled    dokku core repo plugin
-  resource             0.17.8 enabled    dokku core resource plugin
-  scheduler-docker-local 0.17.8 enabled    dokku core scheduler-docker-local plugin
-  shell                0.17.8 enabled    dokku core shell plugin
-  ssh-keys             0.17.8 enabled    dokku core ssh-keys plugin
-  storage              0.17.8 enabled    dokku core storage plugin
-  tags                 0.17.8 enabled    dokku core tags plugin
-  tar                  0.17.8 enabled    dokku core tar plugin
-  trace                0.17.8 enabled    dokku core trace plugin
+  00_dokku-standard    0.17.9 enabled    dokku core standard plugin
+  20_events            0.17.9 enabled    dokku core events logging plugin
+  app-json             0.17.9 enabled    dokku core app-json plugin
+  apps                 0.17.9 enabled    dokku core apps plugin
+  build-env            0.17.9 enabled    dokku core build-env plugin
+  buildpacks           0.17.9 enabled    dokku core buildpacks plugin
+  certs                0.17.9 enabled    dokku core certificate management plugin
+  checks               0.17.9 enabled    dokku core checks plugin
+  common               0.17.9 enabled    dokku core common plugin
+  config               0.17.9 enabled    dokku core config plugin
+  docker-options       0.17.9 enabled    dokku core docker-options plugin
+  domains              0.17.9 enabled    dokku core domains plugin
+  enter                0.17.9 enabled    dokku core enter plugin
+  git                  0.17.9 enabled    dokku core git plugin
+  logs                 0.17.9 enabled    dokku core logs plugin
+  network              0.17.9 enabled    dokku core network plugin
+  nginx-vhosts         0.17.9 enabled    dokku core nginx-vhosts plugin
+  plugin               0.17.9 enabled    dokku core plugin plugin
+  proxy                0.17.9 enabled    dokku core proxy plugin
+  ps                   0.17.9 enabled    dokku core ps plugin
+  repo                 0.17.9 enabled    dokku core repo plugin
+  resource             0.17.9 enabled    dokku core resource plugin
+  scheduler-docker-local 0.17.9 enabled    dokku core scheduler-docker-local plugin
+  shell                0.17.9 enabled    dokku core shell plugin
+  ssh-keys             0.17.9 enabled    dokku core ssh-keys plugin
+  storage              0.17.9 enabled    dokku core storage plugin
+  tags                 0.17.9 enabled    dokku core tags plugin
+  tar                  0.17.9 enabled    dokku core tar plugin
+  trace                0.17.9 enabled    dokku core trace 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.
diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml
index a1a2a1778..4ab4af5ba 100644
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>
diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json
index 9274fd9b0..36361aa2d 100644
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.8\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.17.9\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"
diff --git a/docs/assets/style.css b/docs/assets/style.css
index 4b2a9c0c4..530ccb3b3 100644
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
diff --git a/docs/assets/versions.json b/docs/assets/versions.json
index bf3455a43..8a2610baa 100644
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -14,6 +14,6 @@
     "0.14.6",
     "0.15.5",
     "0.16.4",
-    "0.17.8"
+    "0.17.9"
   ]
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 01fc9cea4..b23bbe570 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.17.8-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.17.9-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'
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index bc2a8846e..e93fd2928 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh;
-sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.17.9/bootstrap.sh;
+sudo DOKKU_TAG=v0.17.9 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
diff --git a/docs/home.html b/docs/home.html
index 67b47fd99..7bf681bd0 100644
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.8/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.17.9/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.17.8 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.17.9 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
diff --git a/docs/template.html b/docs/template.html
index 881ebfcde..22afb07fd 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.8/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.17.9/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
diff --git a/plugins/00_dokku-standard/plugin.toml b/plugins/00_dokku-standard/plugin.toml
index 2b78c3ac4..3964ca8ff 100644
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/20_events/plugin.toml b/plugins/20_events/plugin.toml
index 508a91193..19eba27a4 100644
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/app-json/plugin.toml b/plugins/app-json/plugin.toml
index ddb6e6a50..11153dca2 100644
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/apps/plugin.toml b/plugins/apps/plugin.toml
index 43700762e..47d925ff7 100644
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/build-env/plugin.toml b/plugins/build-env/plugin.toml
index d5a5ba56e..2513dd959 100644
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/buildpacks/plugin.toml b/plugins/buildpacks/plugin.toml
index 1c47b0f40..c6300810e 100644
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/certs/plugin.toml b/plugins/certs/plugin.toml
index dd67090d1..a6cc1980b 100644
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/checks/plugin.toml b/plugins/checks/plugin.toml
index 3724d7c56..c0612c81c 100644
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/common/plugin.toml b/plugins/common/plugin.toml
index a08e9588f..db854abe0 100644
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/config/plugin.toml b/plugins/config/plugin.toml
index 38d84c277..33d986cc0 100644
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/docker-options/plugin.toml b/plugins/docker-options/plugin.toml
index 91edc5d42..0056cd73e 100644
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/domains/plugin.toml b/plugins/domains/plugin.toml
index 1e2db6e3d..d9a0f5d75 100644
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/enter/plugin.toml b/plugins/enter/plugin.toml
index 292f1eed7..7462c67cd 100644
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/git/plugin.toml b/plugins/git/plugin.toml
index 73a14496f..5f32a40a0 100644
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/logs/plugin.toml b/plugins/logs/plugin.toml
index 7d85ee2fa..fa3e3f49b 100644
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/network/plugin.toml b/plugins/network/plugin.toml
index 97ae03f10..0f1d52375 100644
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/nginx-vhosts/plugin.toml b/plugins/nginx-vhosts/plugin.toml
index c1a23c3a2..38f589622 100644
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/plugin/plugin.toml b/plugins/plugin/plugin.toml
index 774878360..4da252316 100644
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/proxy/plugin.toml b/plugins/proxy/plugin.toml
index 484c51f99..9a29e44fb 100644
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/ps/plugin.toml b/plugins/ps/plugin.toml
index cd473e9f1..00461abaa 100644
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/repo/plugin.toml b/plugins/repo/plugin.toml
index a3b7cd8cd..39dd0fd82 100644
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/resource/plugin.toml b/plugins/resource/plugin.toml
index 53ca5d9e4..e25647e26 100644
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/scheduler-docker-local/plugin.toml b/plugins/scheduler-docker-local/plugin.toml
index 15ed1726b..92777fa4f 100644
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/shell/plugin.toml b/plugins/shell/plugin.toml
index 1059bc654..f50aeec8f 100644
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/ssh-keys/plugin.toml b/plugins/ssh-keys/plugin.toml
index 74b15a806..009424674 100644
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/storage/plugin.toml b/plugins/storage/plugin.toml
index dd556169e..112890449 100644
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/tags/plugin.toml b/plugins/tags/plugin.toml
index a79be92f7..426b3e53d 100644
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/tar/plugin.toml b/plugins/tar/plugin.toml
index 185080eb2..7afea3137 100644
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]
diff --git a/plugins/trace/plugin.toml b/plugins/trace/plugin.toml
index 8818eaf70..fd79531dc 100755
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.17.8"
+version = "0.17.9"
 [plugin.config]

From 966afcb78759747484c56033816068af269b42e7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 19 Jun 2019 13:50:29 -0400
Subject: [PATCH 152/163] chore: add missing hooks to events plugin and plugin
 triggers docs

---
 docs/development/plugin-triggers.md          | 111 ++++++++++++++-----
 plugins/20_events/app-restart                |   1 +
 plugins/20_events/app-urls                   |   1 +
 plugins/20_events/docker-args-process-build  |   1 +
 plugins/20_events/docker-args-process-deploy |   1 +
 plugins/20_events/docker-args-process-run    |   1 +
 plugins/20_events/git-revision               |   1 +
 plugins/20_events/resource-get-property      |   1 +
 plugins/20_events/scheduler-app-status       |   1 +
 plugins/20_events/scheduler-inspect          |   1 +
 plugins/20_events/scheduler-is-deployed      |   1 +
 plugins/20_events/scheduler-logs             |   1 +
 plugins/20_events/scheduler-logs-failed      |   1 +
 plugins/20_events/scheduler-post-delete      |   1 +
 plugins/20_events/scheduler-retire           |   1 +
 15 files changed, 96 insertions(+), 29 deletions(-)
 create mode 120000 plugins/20_events/app-restart
 create mode 120000 plugins/20_events/app-urls
 create mode 120000 plugins/20_events/docker-args-process-build
 create mode 120000 plugins/20_events/docker-args-process-deploy
 create mode 120000 plugins/20_events/docker-args-process-run
 create mode 120000 plugins/20_events/git-revision
 create mode 120000 plugins/20_events/resource-get-property
 create mode 120000 plugins/20_events/scheduler-app-status
 create mode 120000 plugins/20_events/scheduler-inspect
 create mode 120000 plugins/20_events/scheduler-is-deployed
 create mode 120000 plugins/20_events/scheduler-logs
 create mode 120000 plugins/20_events/scheduler-logs-failed
 create mode 120000 plugins/20_events/scheduler-post-delete
 create mode 120000 plugins/20_events/scheduler-retire

diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index a7e52baf7..eaf905aa8 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -29,6 +29,21 @@ The following plugin triggers describe those available to a Dokku installation.
 
 > The example plugin trigger code is not guaranteed to be implemented as in within dokku, and are merely simplified examples. Please look at the Dokku source for larger, more in-depth examples.
 
+### `app-restart`
+
+- Description: Triggers an app restart
+- Invoked by: `dokku config:clear`, `dokku config:set`, `dokku config:unset`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `app-urls`
 
 - Description: Allows you to change the urls Dokku reports for an application. Will override any auto-detected urls.
@@ -291,26 +306,6 @@ verify_app_name "$APP"
 # TODO
 ```
 
-### `docker-args-run`
-
-> Warning: Deprecated, please use `docker-args-process-run` instead
-
-- Description:
-- Invoked by: `dokku run`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-# TODO
-```
-
 ### `docker-args-process-build`
 
 - Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
@@ -365,6 +360,26 @@ verify_app_name "$APP"
 # TODO
 ```
 
+### `docker-args-run`
+
+> Warning: Deprecated, please use `docker-args-process-run` instead
+
+- Description:
+- Invoked by: `dokku run`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
 ### `git-post-pull`
 
 - Description:
@@ -1162,9 +1177,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `proxy-enable`
+### `proxy-disable`
 
-- Description: Enables the configured proxy implementation for an app
+- Description: Disables the configured proxy implementation for an app
 - Invoked by: `internally triggered by ps:restore`
 - Arguments: `$APP`
 - Example:
@@ -1177,9 +1192,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `proxy-disable`
+### `proxy-enable`
 
-- Description: Disables the configured proxy implementation for an app
+- Description: Enables the configured proxy implementation for an app
 - Invoked by: `internally triggered by ps:restore`
 - Arguments: `$APP`
 - Example:
@@ -1234,6 +1249,22 @@ fi
 plugn trigger receive-app $APP $newrev
 ```
 
+### `report`
+
+- Description: Allows you to report on any custom configuration in use by your application
+- Invoked by: `dokku report`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1";
+
+# TODO
+```
+
 ### `resource-get-property`
 
 - Description: Fetches a given resource property value
@@ -1267,18 +1298,21 @@ APP="$1"; HOSTNAME=$(hostname -s)
 mail -s "$APP containers on $HOSTNAME failed to retire" ops@dokku.me
 ```
 
-### `report`
+### `scheduler-app-status`
 
-- Description: Allows you to report on any custom configuration in use by your application
-- Invoked by: `dokku report`
-- Arguments: `$APP`
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Fetch the status of an app
+- Invoked by: `dokku ps:report`
+- Arguments: `$DOKKU_SCHEDULER $APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-APP="$1";
+DOKKU_SCHEDULER="$1"; APP="$2";
 
 # TODO
 ```
@@ -1396,6 +1430,25 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 # TODO
 ```
 
+### `scheduler-post-delete`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when an app is deleted
+- Invoked by: `dokku apps:destroy`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_TAG="$3";
+
+# TODO
+```
+
 ### `scheduler-retire`
 
 > Warning: The scheduler plugin trigger apis are under development and may change
diff --git a/plugins/20_events/app-restart b/plugins/20_events/app-restart
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/app-restart
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/app-urls b/plugins/20_events/app-urls
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/app-urls
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/docker-args-process-build b/plugins/20_events/docker-args-process-build
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/docker-args-process-build
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/docker-args-process-deploy b/plugins/20_events/docker-args-process-deploy
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/docker-args-process-deploy
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/docker-args-process-run b/plugins/20_events/docker-args-process-run
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/docker-args-process-run
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/git-revision b/plugins/20_events/git-revision
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/git-revision
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/resource-get-property b/plugins/20_events/resource-get-property
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/resource-get-property
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-app-status b/plugins/20_events/scheduler-app-status
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-app-status
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-inspect b/plugins/20_events/scheduler-inspect
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-inspect
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-is-deployed b/plugins/20_events/scheduler-is-deployed
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-is-deployed
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-logs b/plugins/20_events/scheduler-logs
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-logs
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-logs-failed b/plugins/20_events/scheduler-logs-failed
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-logs-failed
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-post-delete b/plugins/20_events/scheduler-post-delete
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-post-delete
@@ -0,0 +1 @@
+hook
\ No newline at end of file
diff --git a/plugins/20_events/scheduler-retire b/plugins/20_events/scheduler-retire
new file mode 120000
index 000000000..5178a749f
--- /dev/null
+++ b/plugins/20_events/scheduler-retire
@@ -0,0 +1 @@
+hook
\ No newline at end of file

From 2fd53a7a01b15a9eff64508c57ad20c9c063f661 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 21 Jun 2019 10:24:33 -0400
Subject: [PATCH 153/163] fix: allow default trace function to work

Also add some simple tests for the trace plugin.
---
 dokku                    |  2 +-
 tests/unit/40_trace.bats | 62 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/40_trace.bats

diff --git a/dokku b/dokku
index 09b64ecf1..561a82774 100755
--- a/dokku
+++ b/dokku
@@ -137,7 +137,7 @@ execute_dokku_cmd() {
     deploy | delete | ls | run | cleanup)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
-    trace | url | urls | report)
+    url | urls | report)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
   esac
diff --git a/tests/unit/40_trace.bats b/tests/unit/40_trace.bats
new file mode 100644
index 000000000..5a16b139a
--- /dev/null
+++ b/tests/unit/40_trace.bats
@@ -0,0 +1,62 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+}
+
+teardown() {
+  rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  global_teardown
+}
+
+@test "(trace) trace:on" {
+  run /bin/bash -c "dokku trace:on"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
+@test "(trace) trace on" {
+  run /bin/bash -c "dokku trace on"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
+@test "(trace) trace:off, trace off" {
+  touch "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  run /bin/bash -c "dokku trace:off"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  touch "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  run /bin/bash -c "dokku trace off"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+
+  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+}

From 7fc877002731a469a522184677b80074961d0dd0 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 29 Jun 2019 15:10:35 -0400
Subject: [PATCH 154/163] feat: refactor IsImageHerokuishBased to match shell
 version

The shell version is faster due to not needing to create a new container.
---
 plugins/common/common.go | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/plugins/common/common.go b/plugins/common/common.go
index bdc19a95c..0f70f8d59 100644
--- a/plugins/common/common.go
+++ b/plugins/common/common.go
@@ -135,8 +135,8 @@ func DirectoryExists(filePath string) bool {
 }
 
 // DockerInspect runs an inspect command with a given format against a container id
-func DockerInspect(containerID, format string) (output string, err error) {
-	b, err := sh.Command(DockerBin(), "inspect", "--format", format, containerID).Output()
+func DockerInspect(containerOrImageID, format string) (output string, err error) {
+	b, err := sh.Command(DockerBin(), "inspect", "--format", format, containerOrImageID).Output()
 	if err != nil {
 		return "", err
 	}
@@ -246,25 +246,11 @@ func IsDeployed(appName string) bool {
 
 // IsImageHerokuishBased returns true if app image is based on herokuish
 func IsImageHerokuishBased(image string) bool {
-	// circleci can't support --rm as they run lxc in lxc
-	dockerArgs := ""
-	if !FileExists("/home/ubuntu/.circlerc") {
-		dockerArgs = "--rm"
+	output, err := DockerInspect(image, "{{range .Config.Env}}{{if eq . \"USER=herokuishuser\" }}{{println .}}{{end}}{{end}}")
+	if err != nil {
+		return false
 	}
-
-	dockerGlobalArgs := os.Getenv("DOKKU_GLOBAL_RUN_ARGS")
-	parts := []string{DockerBin(), "run", dockerGlobalArgs, "--entrypoint=\"/bin/sh\"", dockerArgs, image, "-c", "\"test -f /exec\""}
-
-	var dockerCmdParts []string
-	for _, str := range parts {
-		if str != "" {
-			dockerCmdParts = append(dockerCmdParts, str)
-		}
-	}
-
-	dockerCmd := NewShellCmd(strings.Join(dockerCmdParts, " "))
-	dockerCmd.ShowOutput = false
-	return dockerCmd.Execute()
+	return output != ""
 }
 
 // MustGetEnv returns env variable or fails if it's not set

From b35235f1e9c84d2b94e9eefbaa409cec9cd57d89 Mon Sep 17 00:00:00 2001
From: Alexy Mikhailichenko <alexy@gorges.us>
Date: Mon, 1 Jul 2019 14:14:34 -0400
Subject: [PATCH 155/163] Change 502 error page to automatically refresh if
 backend status changes

---
 plugins/nginx-vhosts/templates/502-error.html | 64 +++++++++++++++++++
 .../nginx-vhosts/templates/nginx.conf.sigil   |  8 ++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 plugins/nginx-vhosts/templates/502-error.html

diff --git a/plugins/nginx-vhosts/templates/502-error.html b/plugins/nginx-vhosts/templates/502-error.html
new file mode 100644
index 000000000..0390baaa8
--- /dev/null
+++ b/plugins/nginx-vhosts/templates/502-error.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #6CABF7;
+    color: #fff;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  div {
+    position:absolute;
+    top: 50%;
+    left: 50%;
+    transform: translateX(-50%) translateY(-50%);
+  }
+  p {
+    color: #eee;
+  }
+  </style>
+
+  <script>
+    /* Attempt to automatically reload, assuming there's a temporary gateway issue */
+    var retry_current = 2; // First refresh at 2 seconds
+    var retry_limit = 4096; // Maximum backoff time, ~68 minutes
+
+    check_gateway = function () {
+
+      var request = new XMLHttpRequest();
+      request.open('HEAD', window.location.href, true);
+
+      request.onload = function () {
+
+        console.dir(window.location.href, 'returned', request.status);
+
+        if (request.status >= 200 && request.status < 400) {
+          window.location.reload(true);
+        } else {
+          if (retry_current < retry_limit) {
+            retry_current *= 2;
+          }
+
+          console.dir('Trying', window.location.href, 'in', retry_current, 'seconds...');
+          setTimeout(check_gateway, retry_current * 1000);
+        }
+      };
+
+      request.send();
+    };
+
+    setTimeout(check_gateway, retry_current * 1000);
+  </script>
+</head>
+
+<body>
+  <div>
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil
index 360ba4a6a..e67ba75e3 100644
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -105,11 +105,17 @@ server {
     internal;
   }
 
-  error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html;
+  error_page 500 501 503 504 505 506 507 508 509 510 511 /500-error.html;
   location /500-error.html {
     root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
     internal;
   }
+
+  error_page 502 /502-error.html;
+  location /502-error.html {
+    root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
+    internal;
+  }
 }
 {{ end }}{{ end }}
 

From 75036dfa2752e6e3fa3d808a4bb105b8732a0fdc Mon Sep 17 00:00:00 2001
From: Alexy Mikhailichenko <alexy@gorges.us>
Date: Mon, 1 Jul 2019 14:24:36 -0400
Subject: [PATCH 156/163] Remove console calls

---
 plugins/nginx-vhosts/templates/502-error.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/502-error.html b/plugins/nginx-vhosts/templates/502-error.html
index 0390baaa8..6b6693cee 100644
--- a/plugins/nginx-vhosts/templates/502-error.html
+++ b/plugins/nginx-vhosts/templates/502-error.html
@@ -43,7 +43,6 @@
             retry_current *= 2;
           }
 
-          console.dir('Trying', window.location.href, 'in', retry_current, 'seconds...');
           setTimeout(check_gateway, retry_current * 1000);
         }
       };

From a496ae987af4fcbb36fc5c202ce78d5a2961ac13 Mon Sep 17 00:00:00 2001
From: Alexy Mikhailichenko <alexy@gorges.us>
Date: Mon, 1 Jul 2019 17:10:45 -0400
Subject: [PATCH 157/163] Remove console calls

---
 plugins/nginx-vhosts/templates/502-error.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/nginx-vhosts/templates/502-error.html b/plugins/nginx-vhosts/templates/502-error.html
index 6b6693cee..fba8b3e04 100644
--- a/plugins/nginx-vhosts/templates/502-error.html
+++ b/plugins/nginx-vhosts/templates/502-error.html
@@ -34,8 +34,6 @@
 
       request.onload = function () {
 
-        console.dir(window.location.href, 'returned', request.status);
-
         if (request.status >= 200 && request.status < 400) {
           window.location.reload(true);
         } else {

From c99f92e9f2cf86fadc748d85efd219e7174e1532 Mon Sep 17 00:00:00 2001
From: Alexy Mikhailichenko <alexy@gorges.us>
Date: Mon, 1 Jul 2019 17:17:14 -0400
Subject: [PATCH 158/163] Change 500 to 502

---
 plugins/nginx-vhosts/templates/502-error.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/502-error.html b/plugins/nginx-vhosts/templates/502-error.html
index fba8b3e04..45640345d 100644
--- a/plugins/nginx-vhosts/templates/502-error.html
+++ b/plugins/nginx-vhosts/templates/502-error.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>We're sorry, but something went wrong (500)</title>
+  <title>We're sorry, but something went wrong (502)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {

From a984464931248a7bcb7c6bdd2172d8419aaf1a65 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 3 Jul 2019 13:53:56 -0400
Subject: [PATCH 159/163] fix: drop extra % sign in common.LogVerboseQuiet

---
 plugins/network/src/triggers/install/install.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/network/src/triggers/install/install.go b/plugins/network/src/triggers/install/install.go
index cb4931ef7..6b595c833 100644
--- a/plugins/network/src/triggers/install/install.go
+++ b/plugins/network/src/triggers/install/install.go
@@ -22,12 +22,12 @@ func main() {
 			continue
 		}
 		if proxy.IsAppProxyEnabled(appName) {
-			common.LogVerboseQuiet("Setting %s network property 'bind-all-interfaces' to false")
+			common.LogVerboseQuiet("Setting network property 'bind-all-interfaces' to false")
 			if err := common.PropertyWrite("network", appName, "bind-all-interfaces", "false"); err != nil {
 				common.LogWarn(err.Error())
 			}
 		} else {
-			common.LogVerboseQuiet("Setting %s network property 'bind-all-interfaces' to true")
+			common.LogVerboseQuiet("Setting network property 'bind-all-interfaces' to true")
 			if err := common.PropertyWrite("network", appName, "bind-all-interfaces", "true"); err != nil {
 				common.LogWarn(err.Error())
 			}

From 699719b600528799c33f61c15e4e964dc9cfe332 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 5 Jul 2019 10:00:52 -0400
Subject: [PATCH 160/163] fix: handle case where there are empty newlines in
 the authorized_keys file

Previously, an empty line would result in a failing ssh-keys:list call, or a failure to verify the file. Newlines should be ignored.
---
 plugins/ssh-keys/functions  | 1 +
 tests/unit/30_ssh_keys.bats | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/plugins/ssh-keys/functions b/plugins/ssh-keys/functions
index 7368a2749..4569d9f1c 100755
--- a/plugins/ssh-keys/functions
+++ b/plugins/ssh-keys/functions
@@ -20,6 +20,7 @@ verify_ssh_key_file() {
 
   while read -r key; do
     line=$((line + 1))
+    [[ -z "$key" ]] && continue
     echo "$key" >"$TMP_KEY_FILE"
     ssh-keygen -lf "$TMP_KEY_FILE" &>/dev/null || dokku_log_fail "${DOKKU_ROOT}/.ssh/authorized_keys line $line failed ssh-keygen check."
   done <"${DOKKU_ROOT}/.ssh/authorized_keys"
diff --git a/tests/unit/30_ssh_keys.bats b/tests/unit/30_ssh_keys.bats
index b024a9427..7c8274753 100644
--- a/tests/unit/30_ssh_keys.bats
+++ b/tests/unit/30_ssh_keys.bats
@@ -53,6 +53,10 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+  run /bin/bash -c 'echo "" >> "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys"'
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
   run /bin/bash -c "dokku ssh-keys:list | grep name1"
   echo "output: $output"
   echo "status: $status"

From 39f3f598a5a2b0e211ec7878e0607b8641bc145a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 5 Jul 2019 15:39:35 -0400
Subject: [PATCH 161/163] feat: add extra newline for good luck

---
 tests/unit/30_ssh_keys.bats | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/unit/30_ssh_keys.bats b/tests/unit/30_ssh_keys.bats
index 7c8274753..b14d9a06a 100644
--- a/tests/unit/30_ssh_keys.bats
+++ b/tests/unit/30_ssh_keys.bats
@@ -54,6 +54,11 @@ teardown() {
   echo "status: $status"
   assert_success
   run /bin/bash -c 'echo "" >> "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys"'
+  run /bin/bash -c 'echo "" >> "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys"'
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  run /bin/bash -c "dokku ssh-keys:list"
   echo "output: $output"
   echo "status: $status"
   assert_success

From 33423a0508ffcdc0ac3cb966c9bd4a7371013d50 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 5 Jul 2019 16:07:13 -0400
Subject: [PATCH 162/163] feat: purge cache using herokuish image

In some cases, the cache directory may exist but there may be no app image to use for cache purging. This may be the case if the app was never deployed.

Instead of failing, we can simply use the configured herokuish image for clearing cache, as that image is the base image for anything that would have modified cache.
---
 plugins/apps/pre-delete                                 | 8 ++------
 plugins/repo/src/subcommands/purge-cache/purge-cache.go | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/apps/pre-delete b/plugins/apps/pre-delete
index 92a2ae159..24f924071 100755
--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -8,17 +8,13 @@ apps_pre_delete() {
   local trigger="apps_pre_delete"
   local APP="$1"
   local IMAGE_TAG="$2"
-  local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
   local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
   local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
   verify_app_name "$APP"
 
-  if ! is_image_herokuish_based "$IMAGE"; then
-    return
-  fi
-
   if [[ -d $CACHE_DIR ]]; then
-    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+    DOKKU_IMAGE="$(config_get "$APP" DOKKU_IMAGE || echo "$DOKKU_IMAGE")"
+    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$DOKKU_IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
   fi
 }
 
diff --git a/plugins/repo/src/subcommands/purge-cache/purge-cache.go b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
index a1cf19728..2b5732b7e 100644
--- a/plugins/repo/src/subcommands/purge-cache/purge-cache.go
+++ b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/config"
 )
 
 // deletes the contents of the build cache stored in the repository
@@ -23,7 +24,7 @@ func main() {
 	cacheDir := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName, "cache"}, "/")
 	cacheHostDir := strings.Join([]string{common.MustGetEnv("DOKKU_HOST_ROOT"), appName, "cache"}, "/")
 	dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
-	image := common.GetDeployingAppImageName(appName, "", "")
+	image := config.GetWithDefault(appName, "DOKKU_IMAGE", os.Getenv("DOKKU_IMAGE"))
 	if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
 		purgeCacheCmd := common.NewShellCmd(strings.Join([]string{
 			common.DockerBin(),

From 69e4cd7c442a313392ae43c15ee19974748d668f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 5 Jul 2019 16:12:22 -0400
Subject: [PATCH 163/163] refactor: use only a single implementation for cache
 purging

This change moves cache clearing into the repo plugin, and standardizes on a single way of clearing the cache.
---
 plugins/apps/pre-delete                       | 21 -----------
 plugins/repo/Makefile                         | 15 ++++++--
 plugins/repo/repo.go                          | 36 +++++++++++++++++++
 .../subcommands/purge-cache/purge-cache.go    | 26 +++-----------
 .../src/triggers/pre-delete/pre-delete.go     | 19 ++++++++++
 5 files changed, 71 insertions(+), 46 deletions(-)
 delete mode 100755 plugins/apps/pre-delete
 create mode 100644 plugins/repo/repo.go
 create mode 100644 plugins/repo/src/triggers/pre-delete/pre-delete.go

diff --git a/plugins/apps/pre-delete b/plugins/apps/pre-delete
deleted file mode 100755
index 24f924071..000000000
--- a/plugins/apps/pre-delete
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-apps_pre_delete() {
-  declare desc="apps pre-delete plugin trigger"
-  local trigger="apps_pre_delete"
-  local APP="$1"
-  local IMAGE_TAG="$2"
-  local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
-  local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
-  verify_app_name "$APP"
-
-  if [[ -d $CACHE_DIR ]]; then
-    DOKKU_IMAGE="$(config_get "$APP" DOKKU_IMAGE || echo "$DOKKU_IMAGE")"
-    "$DOCKER_BIN" run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$DOKKU_IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
-  fi
-}
-
-apps_pre_delete "$@"
diff --git a/plugins/repo/Makefile b/plugins/repo/Makefile
index 2b7be509a..706a28900 100644
--- a/plugins/repo/Makefile
+++ b/plugins/repo/Makefile
@@ -3,7 +3,7 @@ include ../../common.mk
 GO_ARGS ?= -a
 
 SUBCOMMANDS = subcommands/gc subcommands/purge-cache
-
+TRIGGERS = triggers/pre-delete
 build-in-docker: clean
 	docker run --rm \
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
@@ -11,7 +11,8 @@ build-in-docker: clean
 		$(BUILD_IMAGE) \
 		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?
 
-build: commands subcommands
+build: commands subcommands triggers
+	$(MAKE) triggers-copy
 
 commands: **/**/commands.go
 	go build $(GO_ARGS) -o commands src/commands/commands.go
@@ -22,7 +23,15 @@ subcommands/%: src/subcommands/*/%.go
 	go build $(GO_ARGS) -o $@ $<
 
 clean:
-	rm -rf commands subcommands
+	rm -rf commands subcommands triggers pre-delete
 
 src-clean:
 	rm -rf .gitignore src triggers vendor Makefile *.go glide.*
+
+triggers: $(TRIGGERS)
+
+triggers/%: src/triggers/*/%.go
+	go build $(GO_ARGS) -o $@ $<
+
+triggers-copy:
+	cp triggers/* .
diff --git a/plugins/repo/repo.go b/plugins/repo/repo.go
new file mode 100644
index 000000000..c317e9380
--- /dev/null
+++ b/plugins/repo/repo.go
@@ -0,0 +1,36 @@
+package repo
+
+import (
+	"os"
+	"strings"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/config"
+)
+
+// PurgeCache deletes the contents of the build cache stored in the repository
+func PurgeCache(appName string) error {
+	err := common.VerifyAppName(appName)
+	if err != nil {
+		return err
+	}
+
+	cacheDir := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName, "cache"}, "/")
+	cacheHostDir := strings.Join([]string{common.MustGetEnv("DOKKU_HOST_ROOT"), appName, "cache"}, "/")
+	dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
+	image := config.GetWithDefault(appName, "DOKKU_IMAGE", os.Getenv("DOKKU_IMAGE"))
+	if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
+		purgeCacheCmd := common.NewShellCmd(strings.Join([]string{
+			common.DockerBin(),
+			"run --rm", dokkuGlobalRunArgs,
+			"-v", strings.Join([]string{cacheHostDir, ":/cache"}, ""), image,
+			`find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} ;`}, " "))
+		purgeCacheCmd.Execute()
+		err := os.MkdirAll(cacheDir, 0644)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/plugins/repo/src/subcommands/purge-cache/purge-cache.go b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
index 2b5732b7e..63665ca18 100644
--- a/plugins/repo/src/subcommands/purge-cache/purge-cache.go
+++ b/plugins/repo/src/subcommands/purge-cache/purge-cache.go
@@ -2,11 +2,9 @@ package main
 
 import (
 	"flag"
-	"os"
-	"strings"
 
 	"github.com/dokku/dokku/plugins/common"
-	"github.com/dokku/dokku/plugins/config"
+	"github.com/dokku/dokku/plugins/repo"
 )
 
 // deletes the contents of the build cache stored in the repository
@@ -16,25 +14,9 @@ func main() {
 	if appName == "" {
 		common.LogFail("Please specify an app to run the command on")
 	}
-	err := common.VerifyAppName(appName)
-	if err != nil {
-		common.LogFail(err.Error())
-	}
 
-	cacheDir := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName, "cache"}, "/")
-	cacheHostDir := strings.Join([]string{common.MustGetEnv("DOKKU_HOST_ROOT"), appName, "cache"}, "/")
-	dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
-	image := config.GetWithDefault(appName, "DOKKU_IMAGE", os.Getenv("DOKKU_IMAGE"))
-	if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
-		purgeCacheCmd := common.NewShellCmd(strings.Join([]string{
-			common.DockerBin(),
-			"run --rm", dokkuGlobalRunArgs,
-			"-v", strings.Join([]string{cacheHostDir, ":/cache"}, ""), image,
-			`find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} ;`}, " "))
-		purgeCacheCmd.Execute()
-		err := os.MkdirAll(cacheDir, 0644)
-		if err != nil {
-			common.LogFail(err.Error())
-		}
+	err := repo.PurgeCache(appName)
+	if err != nil {
+		common.LogWarn(err.Error())
 	}
 }
diff --git a/plugins/repo/src/triggers/pre-delete/pre-delete.go b/plugins/repo/src/triggers/pre-delete/pre-delete.go
new file mode 100644
index 000000000..c43f5fba0
--- /dev/null
+++ b/plugins/repo/src/triggers/pre-delete/pre-delete.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"flag"
+
+	"github.com/dokku/dokku/plugins/common"
+	"github.com/dokku/dokku/plugins/repo"
+)
+
+// destroys the buildpacks property for a given app container
+func main() {
+	flag.Parse()
+	appName := flag.Arg(0)
+
+	err := repo.PurgeCache(appName)
+	if err != nil {
+		common.LogFail(err.Error())
+	}
+}