Release 0.26.7

# History

## 0.26.7

Install/update via the bootstrap script:

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

### Bug Fixes

- #5003: @josegonzalez Respect pre-existing .env files when preparing the herokuish buildenv
- #4950: @emdienn Use exported environment vars during pack build
- #4999: @elhu Purge cache for all apps when calling buildpacks:set-property with --global flag
- #4988: @fomojola Conditionally restart NGINX
- #4922: @josegonzalez Gitignore more built plugin triggers in apps plugin

### New Features

- #4964: @josegonzalez Add log message when running state is false
- #4970: @josegonzalez Log the string error and not bytes when there is an issue updating the cron schedule
- #4924: @josegonzalez Update devcontainer to include aliased go packages
- #4920: @josegonzalez Ensure related go source and vscode plugins are installed in devcontainer

### Documentation

- #4949: @IlyaSemenov docs: update herokuish upgrade instructions
- #4992: @anthonyshew Typo for deploying using image SHA
- #4976: @josegonzalez Update link in header to dokku pro
- #4972: @Dam-Buty Clarify cron:report command
- #4943: @Stormheg Fix typo in registry management documentation
- #4935: @josegonzalez Reword note about env vars in nginx config templates

### Other

- #4995: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php
- #4978: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php
- #4936: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php
- #4937: @dependabot[bot] chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled

.devcontainer/Dockerfile

@@ -7,6 +7,12 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \
   apt-get autoremove --yes && \
   rm -rf /var/lib/apt/lists/*
 
+RUN wget https://dl.google.com/go/go1.16.10.linux-amd64.tar.gz && \
+  tar -xvf go1.16.10.linux-amd64.tar.gz && \
+  mv go /usr/local
+
+RUN GOROOT=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@latest 2>&1
+
 ADD https://raw.githubusercontent.com/dokku/dokku/master/tests/dhparam.pem /mnt/dokku/etc/nginx/dhparam.pem
 
 COPY .devcontainer/bin/ /usr/local/bin/
@@ -15,5 +21,6 @@ RUN make ci-dependencies
 
 COPY . .
 
-ENV DOKKU_HOSTNAME=dokku.me
+ENV DOKKU_HOSTNAME=dokku.me GOROOT=/usr/local/go PATH=/usr/local/go/bin:$PATH PLUGIN_MAKE_TARGET=build
+
 LABEL org.label-schema.schema-version=1.0 org.label-schema.vendor=dokku com.dokku.devcontainer=true

.devcontainer/bin/copy-plugin

@@ -3,7 +3,7 @@
 main() {
   declare PLUGIN_NAME="$1"
 
-  make go-build-plugin copyplugin PLUGIN_NAME=$PLUGIN_NAME
+  make go-build-plugin copyplugin PLUGIN_NAME=$PLUGIN_NAME PLUGIN_MAKE_TARGET=build
 }
 
 main "$@"

.devcontainer/bin/go-mod-downloadall

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -x
+
+main() {
+  find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
+    if [[ ! -f "plugins/$plugin/go.mod" ]]; then
+      continue
+    fi
+
+    pushd "plugins/$plugin" >/dev/null || return 1
+    echo "====> Cloning all modules $plugin"
+    go list -m -f '{{define "M"}}git clone https://{{.Path}}.git /root/go/src/{{.Path}} || true{{end}}{{if not .Main}}{{if not .Replace}}{{template "M" .}}{{end}}{{end}}' all >tmp-file
+    bash tmp-file
+    rm tmp-file
+    popd >/dev/null || return 1
+  done
+
+  git clone --branch v2 https://github.com/go-yaml/yaml.git /root/go/src/gopkg.in/yaml.v2 || true
+  git clone --branch v3 https://github.com/robfig/cron /root/go/src/github.com/robfig/cron/v3 || true
+  git clone https://github.com/golang/net /root/go/src/golang.org/x/net || true
+  git clone https://github.com/golang/protobuf.git /root/go/src/github.com/golang/protobuf || true
+  git clone https://github.com/golang/sync /root/go/src/golang.org/x/sync || true
+  git clone https://github.com/golang/sys.git /root/go/src/golang.org/x/sys || true
+  git clone https://github.com/golang/text.git /root/go/src/golang.org/x/text || true
+  git clone https://github.com/googleapis/go-genproto.git /root/go/src/google.golang.org/genproto || true
+  git clone https://github.com/grpc/grpc-go.git /root/go/src/google.golang.org/grpc || true
+  git clone https://github.com/onsi/gomega /root/go/src/github.com/onsi/gomega || true
+  git clone https://github.com/protocolbuffers/protobuf-go.git /root/go/src/google.golang.org/protobuf || true
+}
+
+main "$@"

.devcontainer/devcontainer.json

@@ -7,12 +7,19 @@
     "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data/home/dokku",
     "GO_ROOT_MOUNT": "${localWorkspaceFolder}:/go/src/github.com/dokku/dokku"
   },
+  "extensions": [
+    "golang.go",
+    "mads-hartmann.bash-ide-vscode",
+    "ms-vscode.makefile-tools"
+  ],
   "initializeCommand": ["mkdir", "-p", "tmp/data"],
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
     "source=${localWorkspaceFolder}/tmp/data/,target=/mnt/dokku/,type=bind"
   ],
   "overrideCommand": false,
-  "postCreateCommand": ["make", "setup-deploy-tests"],
+  "postCreateCommand": "make setup-deploy-tests && go-mod-downloadall",
-  "runArgs": ["--init"]
+  "runArgs": ["--init"],
+  "workspaceFolder": "/root/go/src/github.com/dokku/dokku",
+  "workspaceMount": "type=bind,source=${localWorkspaceFolder},target=/root/go/src/github.com/dokku/dokku,consistency=cached"
 }

.github/workflows/lint.yml

@@ -18,8 +18,8 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
       - name: Run hadolint
-        uses: brpaz/hadolint-action@1623ba61710b974b55ba455930e6f2c8ef919778
+        uses: hadolint/hadolint-action@d7b38582334d9ac11c12021c16f21d63015fa250
-        # v1.3.1 => 1623ba61710b974b55ba455930e6f2c8ef919778
+        # v1.6.0 => d7b38582334d9ac11c12021c16f21d63015fa250
 
   markdown-lint:
     name: markdown-lint
@@ -41,11 +41,11 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
       - name: Run shellcheck
-        uses: ludeeus/action-shellcheck@d586102c117f97e63d7e3b56629d269efc9a7c60
+        uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
-        # 1.0.0 => d586102c117f97e63d7e3b56629d269efc9a7c60
+        # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
         env:
           # keep in sync with tests/shellcheck-exclude
-          SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267
+          SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267 -e SC2295
 
   shfmt:
     name: shfmt
@@ -54,8 +54,8 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
       - name: Run shfmt
-        uses: luizm/action-sh-checker@442951059cb22d260c6e69309ae59cb7bb2334b8
+        uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
-        # v0.1.12 => 442951059cb22d260c6e69309ae59cb7bb2334b8
+        # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
         env:
           SHFMT_OPTS: -l -bn -ci -i 2 -d
         with:
@@ -68,7 +68,7 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@b2aeacc1b7eeb8c23e84bba320d04fb5d6a323ee
+        uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
-        # v3.0.0 => b2aeacc1b7eeb8c23e84bba320d04fb5d6a323ee
+        # v3.0.4 => ed2b6e911569708ed121c14b87d513860a7e36a7
         with:
           config_file: '.github/linters/.yamllint.yml'

.github/workflows/release.yml

@@ -83,6 +83,8 @@ jobs:
         run: |
           git config --global user.name 'Dokku Bot'
           git config --global user.email no-reply@dokku.com
-          # brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git"
+          curl -sSL https://github.com/dokku/netrc/releases/download/v0.4.1/netrc_0.4.1_darwin_x86_64.tgz | tar xvf -
+          mv netrc /usr/local/bin/netrc
+          netrc set github.com "$HOMEBREW_GITHUB_USERNAME" "$HOMEBREW_GITHUB_API_TOKEN"
           brew tap dokku/repo
           brew bump-formula-pr -f --no-browse --no-audit --no-fork --debug --verbose --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku

.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .ruby-version
 .idea/
+.vscode/
 .vagrant
 build/
 data/

HISTORY.md

@@ -1,5 +1,119 @@
 # History
 
+## 0.26.7
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #5003: @josegonzalez Respect pre-existing .env files when preparing the herokuish buildenv
+- #4950: @emdienn Use exported environment vars during pack build
+- #4999: @elhu Purge cache for all apps when calling buildpacks:set-property with --global flag
+- #4988: @fomojola Conditionally restart NGINX
+- #4922: @josegonzalez Gitignore more built plugin triggers in apps plugin
+
+### New Features
+
+- #4964: @josegonzalez Add log message when running state is false
+- #4970: @josegonzalez Log the string error and not bytes when there is an issue updating the cron schedule
+- #4924: @josegonzalez Update devcontainer to include aliased go packages
+- #4920: @josegonzalez Ensure related go source and vscode plugins are installed in devcontainer
+
+### Documentation
+
+- #4949: @IlyaSemenov docs: update herokuish upgrade instructions
+- #4992: @anthonyshew Typo for deploying using image SHA
+- #4976: @josegonzalez Update link in header to dokku pro
+- #4972: @Dam-Buty Clarify cron:report command
+- #4943: @Stormheg Fix typo in registry management documentation
+- #4935: @josegonzalez Reword note about env vars in nginx config templates
+
+### Other
+
+- #4995: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php
+- #4978: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php
+- #4936: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php
+- #4937: @dependabot[bot] chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled
+
+## 0.26.6
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh
+sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4919: @nerg4l fix: do not validate global flag as an app name
+- #4918: @josegonzalez Use netrc binary to properly release dokku client homebrew formula
+
+## 0.26.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh
+sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4917: @josegonzalez Update golang to fix golang tests
+- #4915: @josegonzalez Add support for --global flag to network:set command
+
+### Documentation
+
+- #4911: @josegonzalez Add initial dokku-pro documentation
+- #4910: @josegonzalez Fix typo on persistent storage docs
+
+### Tests
+
+- #4916: @josegonzalez Ignore new SC2295 shellcheck warning
+- #4906: @josegonzalez Upgrade ci linters
+
+### Other
+
+- #4914: @dependabot[bot] chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
+
+## 0.26.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.4/bootstrap.sh
+sudo DOKKU_TAG=v0.26.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4899: @josegonzalez Ensure we respect quotes and dollar signs in config vars
+- #4890: @josegonzalez Drop which in favor of command -v
+
+### Other
+
+- #4897: @josegonzalez Silence errors when verifying the ssl certificate
+- #4891: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 199 to 200 in /tests/apps/php
+
+## 0.26.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.3/bootstrap.sh
+sudo DOKKU_TAG=v0.26.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4889: @josegonzalez Skip herokuish version in report output and disable the herokuish builder on armhf architectures
+
 ## 0.26.2
 
 Install/update via the bootstrap script:

README.md

@@ -98,8 +98,8 @@ Otherwise, you will need to import the keypair manually after installation using
 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.26.2/bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh
-sudo DOKKU_TAG=v0.26.2 bash bootstrap.sh
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
 ```
 
 You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.

common.mk

@@ -1,7 +1,7 @@
 GO_ARGS ?=
 GO_PLUGIN_MAKE_TARGET ?= build
 GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-BUILD_IMAGE := golang:1.15.6
+BUILD_IMAGE := golang:1.16.10
 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
 GO_MOD_CACHE   ?= /tmp/dokku-go-mod-mod
 GO_ROOT_MOUNT  ?= $$PWD/../..:$(GO_REPO_ROOT)

contrib/dokku_client.sh

@@ -160,7 +160,7 @@ main() {
   }
 }
 
-if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
+if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(command -v dokku) ]]; then
   main "$@"
   exit $?
 fi

debian/control

@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.26.2
+Version: 0.26.7
 Section: web
 Priority: optional
 Architecture: amd64

docs/advanced-usage/persistent-storage.md

@@ -25,7 +25,7 @@ The storage plugin supports the following mount points:
 
 > New as of 0.25.5
 
-A storage directory can be created with the `storage:ensure-directory` command. This command will create a subdirectory in the recommended `/var/lib/doku/data/storage` path - created during Dokku installation - and prepare it for use with an app.
+A storage directory can be created with the `storage:ensure-directory` command. This command will create a subdirectory in the recommended `/var/lib/dokku/data/storage` path - created during Dokku installation - and prepare it for use with an app.
 
 ```shell
 dokku storage:ensure-directory lollipop

docs/advanced-usage/plugin-management.md

@@ -35,35 +35,35 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.26.2 enabled    dokku core standard plugin
+  00_dokku-standard    0.26.7 enabled    dokku core standard plugin
-  20_events            0.26.2 enabled    dokku core events logging plugin
+  20_events            0.26.7 enabled    dokku core events logging plugin
-  app-json             0.26.2 enabled    dokku core app-json plugin
+  app-json             0.26.7 enabled    dokku core app-json plugin
-  apps                 0.26.2 enabled    dokku core apps plugin
+  apps                 0.26.7 enabled    dokku core apps plugin
-  build-env            0.26.2 enabled    dokku core build-env plugin
+  build-env            0.26.7 enabled    dokku core build-env plugin
-  buildpacks           0.26.2 enabled    dokku core buildpacks plugin
+  buildpacks           0.26.7 enabled    dokku core buildpacks plugin
-  certs                0.26.2 enabled    dokku core certificate management plugin
+  certs                0.26.7 enabled    dokku core certificate management plugin
-  checks               0.26.2 enabled    dokku core checks plugin
+  checks               0.26.7 enabled    dokku core checks plugin
-  common               0.26.2 enabled    dokku core common plugin
+  common               0.26.7 enabled    dokku core common plugin
-  config               0.26.2 enabled    dokku core config plugin
+  config               0.26.7 enabled    dokku core config plugin
-  docker-options       0.26.2 enabled    dokku core docker-options plugin
+  docker-options       0.26.7 enabled    dokku core docker-options plugin
-  domains              0.26.2 enabled    dokku core domains plugin
+  domains              0.26.7 enabled    dokku core domains plugin
-  enter                0.26.2 enabled    dokku core enter plugin
+  enter                0.26.7 enabled    dokku core enter plugin
-  git                  0.26.2 enabled    dokku core git plugin
+  git                  0.26.7 enabled    dokku core git plugin
-  logs                 0.26.2 enabled    dokku core logs plugin
+  logs                 0.26.7 enabled    dokku core logs plugin
-  network              0.26.2 enabled    dokku core network plugin
+  network              0.26.7 enabled    dokku core network plugin
-  nginx-vhosts         0.26.2 enabled    dokku core nginx-vhosts plugin
+  nginx-vhosts         0.26.7 enabled    dokku core nginx-vhosts plugin
-  plugin               0.26.2 enabled    dokku core plugin plugin
+  plugin               0.26.7 enabled    dokku core plugin plugin
-  proxy                0.26.2 enabled    dokku core proxy plugin
+  proxy                0.26.7 enabled    dokku core proxy plugin
-  ps                   0.26.2 enabled    dokku core ps plugin
+  ps                   0.26.7 enabled    dokku core ps plugin
-  repo                 0.26.2 enabled    dokku core repo plugin
+  repo                 0.26.7 enabled    dokku core repo plugin
-  resource             0.26.2 enabled    dokku core resource plugin
+  resource             0.26.7 enabled    dokku core resource plugin
-  scheduler-docker-local 0.26.2 enabled    dokku core scheduler-docker-local plugin
+  scheduler-docker-local 0.26.7 enabled    dokku core scheduler-docker-local plugin
-  shell                0.26.2 enabled    dokku core shell plugin
+  shell                0.26.7 enabled    dokku core shell plugin
-  ssh-keys             0.26.2 enabled    dokku core ssh-keys plugin
+  ssh-keys             0.26.7 enabled    dokku core ssh-keys plugin
-  storage              0.26.2 enabled    dokku core storage plugin
+  storage              0.26.7 enabled    dokku core storage plugin
-  tags                 0.26.2 enabled    dokku core tags plugin
+  tags                 0.26.7 enabled    dokku core tags plugin
-  tar                  0.26.2 enabled    dokku core tar plugin
+  tar                  0.26.7 enabled    dokku core tar plugin
-  trace                0.26.2 enabled    dokku core trace plugin
+  trace                0.26.7 enabled    dokku core trace plugin
 ```
 
 > Warning: All plugin commands other than `plugin:list` and `plugin:help` require sudo access and must be run directly from the Dokku server.

docs/advanced-usage/registry-management.md

@@ -103,7 +103,7 @@ dokku registry:set node-js-app push-on-release
 
 ### Pushing images on build
 
-To push the image on release, set the `push-on-release` property to `true` via the `registry:set` command. The default value for this property is `false`. Setting the property to `true` will result in the imag being tagged with an ID that is incremented with every release. This tag will be what is used for running app code.
+To push the image on release, set the `push-on-release` property to `true` via the `registry:set` command. The default value for this property is `false`. Setting the property to `true` will result in the image being tagged with an ID that is incremented with every release. This tag will be what is used for running app code.
 
 ```shell
 dokku registry:set node-js-app push-on-release true

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

@@ -2,37 +2,37 @@
     "name": "Dokku",
     "icons": [
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"

docs/assets/style.css

@@ -42,13 +42,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }

docs/assets/versions.json

@@ -23,6 +23,6 @@
     "0.23.9",
     "0.24.10",
     "0.25.7",
-    "0.26.2"
+    "0.26.7"
   ]
 }

docs/configuration/nginx.md

@@ -289,7 +289,7 @@ Unsetting this value is the same as enabling custom nginx config usage.
 
 Finally, each process type has it's network listeners - a list of IP:PORT pairs for the respective app containers - exposed via an `.DOKKU_APP_${PROCESS_TYPE}_LISTENERS` variable - the `PROCESS_TYPE` will be upper-cased with hyphens transformed into underscores. Users can use the new variables to expose non-web processes via the nginx proxy.
 
-> Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
+> Note: Application environment variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
 
 #### Customizing via configuration files included by the default templates
 

docs/deployment/methods/git.md

@@ -145,7 +145,7 @@ The resulting `git:from-image` call would then be:
 
 ```shell
 # where the image sha is: sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
-dokku git:from-image node-js-app dokku/node-js-getting-started:@sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
+dokku git:from-image node-js-app dokku/node-js-getting-started@sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
 ```
 
 The `git:from-image` command can optionally take a git `user.name` and `user.email` argument (in that order) to customize the author. If the arguments are left empty, they will fallback to `Dokku` and `automated@dokku.sh`, respectively.

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.26.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.26.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'

docs/enterprise/pro.md

@@ -0,0 +1,32 @@
+# Dokku Pro
+
+Dokku Pro is a commercial offering that provides a familiar Web UI for all common tasks performed by developers. End users can expect an interface that provides various complex cli commands in an intuitive, app-centric manner, quickly speeding up tasks that might otherwise be difficult for new and old users to perform. Additionally, it provides a way to perform these tasks remotely via a json api, enabling easier, audited remote management of servers. Finally, Dokku Pro provides an alternative, https-based method for deploying code which can be used in environments that lockdown ssh access to servers.
+
+## Purchasing
+
+Dokku Pro may be purchased online by clicking the following purchase link:
+
+<a data-dpd-type="button" data-text="PURCHASE NOW" data-variant="price-right" data-button-size="dpd-large" data-bg-color="469d3d" data-bg-color-hover="5cc052" data-text-color="ffffff" data-pr-bg-color="ffffff" data-pr-color="000000" data-lightbox="1" href="https://dokku.dpdcart.com/cart/add?product_id=217344&amp;method_id=236878">Dokku Pro Purchase Link</a>
+
+> Currently, the server must be able to contact the public internet to validate the license, or it will fail to start. For offline support, inquire for enterprise offline licensing.
+
+## Installation
+
+Dokku Pro is shipped as Debian and RPM packages, and depends on the following files:
+
+- `/etc/default/dokku-pro`: Configures certain environment variables for usage by the dokku-pro binary
+- `/etc/dokku-pro/license.key`: Contains the downloaded license key
+- `/var/lib/dokku/data/pro/db`: Contains the local dokku-pro database
+
+Please refer to the purchase email for details on configuring Dokku Pro.
+
+## Features and Development
+
+Dokku Pro has the following functionality:
+
+- Shipped as a single binary for ease of use
+- JSON-API-compatible API with JWT authentication
+- Authenticated HTTP(S) endpoints for git push functionality
+- Single Page App (SPA) Web UI exposing app, datastore, and ssh key management
+
+While each release is fairly feature complete, individual features and documentation will expand over time. Feature development follows a monthly release cadence, with individual bug fixes released on an as needed basis. 

docs/getting-started/install/docker.md

@@ -3,7 +3,7 @@
 Pull the dokku/dokku image:
 
 ```shell
-docker pull dokku/dokku:0.26.2
+docker pull dokku/dokku:0.26.7
 ```
 
 Next, run the image.
@@ -18,7 +18,7 @@ docker container run \
   --publish 8443:443 \
   --volume /var/lib/dokku:/mnt/dokku \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  dokku/dokku:0.26.2
+  dokku/dokku:0.26.7
 ```
 
 The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears.

docs/getting-started/installation.md

@@ -19,8 +19,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.26.2/bootstrap.sh;
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh;
-sudo DOKKU_TAG=v0.26.2 bash bootstrap.sh
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.

docs/getting-started/upgrading.md

@@ -118,6 +118,5 @@ To upgrade Herokuish from source, upgrade with:
 cd /tmp
 git clone https://github.com/gliderlabs/herokuish.git
 cd herokuish
-git pull origin master
+CIRCLECI=true IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest make build/docker
-IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e build-in-docker
 ```

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.26.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.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.26.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/manifest.json">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon.ico">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
     </style>
@@ -62,6 +62,9 @@
               <li class="nav-item">
                 <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://pro.dokku.com/">Pro</a>
+              </li>
             </ul>
           </div>
         </div>
@@ -95,12 +98,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.26.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>

docs/processes/scheduled-cron-tasks.md

@@ -61,12 +61,12 @@ cGhwPT09cGhwIHRlc3QucGhwPT09QGRhaWx5  @daily     node index.js
 cGhwPT09dHJ1ZT09PSogKiAqICogKg==      * * * * *  true
 ```
 
-#### Displaying reports for an app
+#### Displaying reports
 
 You can get a report about the cron configuration for apps using the `cron:report` command:
 
 ```shell
-dokku cron:report node-js-app
+dokku cron:report
 ```
 
 ```

docs/template.html

@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - {{DOC_TITLE}}</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.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.26.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/manifest.json">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/favicon.ico">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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>
@@ -75,6 +75,9 @@
               <li class="nav-item">
                 <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://pro.dokku.com/">Pro</a>
+              </li>
             </ul>
           </div>
         </div>
@@ -103,6 +106,9 @@
             <a href="/{{NAME}}/getting-started/troubleshooting/" class="list-group-item">Troubleshooting</a>
             <a href="/{{NAME}}/getting-started/where-to-get-help/" class="list-group-item">Getting Help</a>
 
+            <a href="#" class="list-group-item disabled">Commercial</a>
+            <a href="/{{NAME}}/enterprise/pro/" class="list-group-item">Dokku Pro</a>
+
             <a href="#" class="list-group-item disabled">Deployment</a>
 
             <a href="/{{NAME}}/deployment/application-deployment/" class="list-group-item">Deploying an Application</a>
@@ -217,6 +223,7 @@
     </div>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script>
+    <script src="https://dokku.dpdcart.com/dpd.js"></script>
     <script>
     // Source: https://github.com/Alhadis/Snippets/blob/master/js/polyfills/IE8-child-elements.js
     if (!('nextElementSibling' in document.documentElement)) {

plugins/00_dokku-standard/install

@@ -6,7 +6,7 @@ if [[ ! -f "$DOKKU_ROOT/VHOST" ]]; then
   [[ $(dig +short "$(hostname -f)") ]] && hostname -f >"$DOKKU_ROOT/VHOST"
 fi
 
-dokku_path="$(which dokku)"
+dokku_path="$(command -v dokku)"
 
 # temporary hack for https://github.com/dokku/dokku/issues/82
 # redeploys all apps after a reboot

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/subcommands/report

@@ -23,7 +23,11 @@ cmd-report() {
   dokku_log_info1 "git version: $(git --version)"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
+  if [[ "$(dpkg --print-architecture 2>/dev/null || true)" == "armhf" ]]; then
+    dokku_log_warn "herokuish not supported on armhf architecture"
+  else
     "$DOCKER_BIN" container run $DOKKU_GLOBAL_RUN_ARGS --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/       /"
+  fi
   dokku_log_info1 "dokku version: $(dokku_version)"
   dokku_log_info1 "plugn version: $(plugn version)"
   dokku_log_info1 "dokku plugins: "

plugins/20_events/plugin.toml

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

plugins/app-json/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/app-json
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/app-json/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/apps/.gitignore

@@ -5,3 +5,5 @@
 /app-*
 /post-*
 /report
+/install
+/deploy-source-set

plugins/apps/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/apps
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/apps/plugin.toml

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

plugins/builder-dockerfile/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-dockerfile plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/builder-herokuish/builder-detect

@@ -8,6 +8,10 @@ trigger-builder-herokuish-builder-detect() {
   declare trigger="builder-detect"
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
 
+  if [[ "$(dpkg --print-architecture 2>/dev/null || true)" == "armhf" ]]; then
+    return
+  fi
+
   if fn-has-buildpacks-file "$SOURCECODE_WORK_DIR"; then
     echo "herokuish"
     return

plugins/builder-herokuish/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-herokuish plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/builder-herokuish/pre-build-buildpack

@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 trigger-builder-herokuish-pre-build-buildpack() {
   declare desc="builder-herokuish pre-build-buildpack plugin trigger"
   declare trigger="pre-build-buildpack"
-  declare APP="$1"
+  declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local IMAGE TMP_WORK_DIR
 
   local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP"
@@ -27,7 +27,13 @@ trigger-builder-herokuish-pre-build-buildpack() {
   config_bundle --merged "$APP" | tar -x -C "$TMP_WORK_DIR/.env.d"
 
   # create build env for 'old style' buildpacks and dokku plugins
-  config_export app "$APP" --format envfile --merged >"$TMP_WORK_DIR/.env"
+  touch "$TMP_WORK_DIR/.env"
+  if [[ -f "$SOURCECODE_WORK_DIR/.env" ]]; then
+    cp -f "$SOURCECODE_WORK_DIR/.env" "$TMP_WORK_DIR/.env"
+  fi
+  local dotenv_contents="$(sed -Ez '$ s/\n+$//' "$TMP_WORK_DIR/.env")"
+  echo "$dotenv_contents" >"$TMP_WORK_DIR/.env"
+  config_export app "$APP" --format envfile --merged >>"$TMP_WORK_DIR/.env"
 
   if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/pre-build.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
     dokku_log_warn "Failure injecting BUILD_ENV into build environment"

plugins/builder-null/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-null plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/builder-pack/builder-build

@@ -28,15 +28,11 @@ trigger-builder-pack-builder-build() {
 
   pushd "$SOURCECODE_WORK_DIR" &>/dev/null
 
-  local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  ENV_ARGS=($(config_export app "$APP" --format pack-keys --merged))
-  trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM
+  eval "$(config_export app "$APP" --merged)"
-
-  config_export app "$APP" --format envfile --merged >"$TMP_FILE"
 
   plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR"
-
+  pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "${ENV_ARGS[@]}"
-  pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web
-
   docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"
 
   plugn trigger post-build-pack "$APP" "$SOURCECODE_WORK_DIR"

plugins/builder-pack/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-pack plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/builder/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/builder
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

plugins/builder/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/buildpacks/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/buildpacks
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/buildpacks/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/buildpacks/subcommands.go

@@ -148,8 +148,20 @@ func CommandSetProperty(appName string, property string, value string) error {
 
 	common.CommandPropertySet("buildpacks", appName, property, value, DefaultProperties, GlobalProperties)
 	if property == "stack" && oldStack != value {
+		if appName != "--global" {
 			return common.PlugnTrigger("post-stack-set", []string{appName, value}...)
 		}
 
+		apps, err := common.DokkuApps()
+		if err != nil {
+			return err
+		}
+		for _, app := range apps {
+			if err := common.PlugnTrigger("post-stack-set", []string{app, value}...); err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }

plugins/certs/internal-functions

@@ -136,9 +136,9 @@ fn-ssl-verified() {
   fi
 
   if [[ -f "$APP_SSL_PATH/server.letsencrypt.crt" ]]; then
-    SSL_VERIFY_OUTPUT="$(openssl verify -verbose -purpose sslserver -CAfile "$APP_SSL_PATH/server.crt" "$APP_SSL_PATH/server.letsencrypt.crt" | awk -F ':' '{ print $2 }' | tail -1 | xargs || true)"
+    SSL_VERIFY_OUTPUT="$(openssl verify -verbose -purpose sslserver -CAfile "$APP_SSL_PATH/server.crt" "$APP_SSL_PATH/server.letsencrypt.crt" 2>/dev/null | awk -F ':' '{ print $2 }' | tail -1 | xargs || true)"
   else
-    SSL_VERIFY_OUTPUT="$(openssl verify -verbose -purpose sslserver "$APP_SSL_PATH/server.crt" | awk -F ':' '{ print $2 }' | tail -1 | xargs || true)"
+    SSL_VERIFY_OUTPUT="$(openssl verify -verbose -purpose sslserver "$APP_SSL_PATH/server.crt" 2>/dev/null | awk -F ':' '{ print $2 }' | tail -1 | xargs || true)"
   fi
 
   if [[ "$SSL_VERIFY_OUTPUT" == "OK" ]]; then

plugins/certs/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/checks/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/common/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/common
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect

plugins/common/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/config/docker-args-deploy

@@ -7,25 +7,13 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 trigger-config-docker-args() {
   declare desc="config docker-args plugin trigger"
   declare trigger="docker-args"
-  declare APP="$1" IMAGE_TAG="$2"
+  declare APP="$1"
-  local ENV_ARGS IMAGE STDIN trigger
+  local ENV_ARGS STDIN
 
-  IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
   STDIN=$(cat)
-  trigger="$0 config_docker_args"
 
-  if is_image_cnb_based "$IMAGE"; then
   ENV_ARGS="$(config_export app "$APP" --format docker-args-keys --merged)"
   echo -n "$STDIN $ENV_ARGS"
-    return
-  fi
-
-  if ! is_image_herokuish_based "$IMAGE" "$APP"; then
-    ENV_ARGS="$(config_export app "$APP" --format docker-args --merged)"
-    echo -n "$STDIN $ENV_ARGS"
-  else
-    echo -n "$STDIN"
-  fi
 }
 
 trigger-config-docker-args "$@"

plugins/config/environment.go

@@ -26,7 +26,7 @@ const (
 	ExportFormatEnvfile
 	//ExportFormatDockerArgs format: --env KEY=VALUE args for docker
 	ExportFormatDockerArgs
-	//ExportFormatDockerArgsKeys format: --env KEY args for docker
+	//ExportFormatDockerArgsKeys format: --env=KEY args for docker
 	ExportFormatDockerArgsKeys
 	//ExportFormatShell format: env arguments for shell
 	ExportFormatShell
@@ -36,6 +36,8 @@ const (
 	ExportFormatJSON
 	//ExportFormatJSONList format: json output as a list of objects
 	ExportFormatJSONList
+	//ExportFormatPackArgKeys format: --env KEY args for pack
+	ExportFormatPackArgKeys
 )
 
 //Env is a representation for global or app environment
@@ -183,6 +185,8 @@ func (e *Env) Export(format ExportFormat) string {
 		return e.JSONString()
 	case ExportFormatJSONList:
 		return e.JSONListString()
+	case ExportFormatPackArgKeys:
+		return e.PackArgKeysAsString()
 	default:
 		common.LogFail(fmt.Sprintf("Unknown export format: %v", format))
 		return ""
@@ -244,6 +248,16 @@ func (e *Env) JSONListString() string {
 	return string(data)
 }
 
+//PackArgKeysAsString gets the contents of this Env in the form -env KEY --env...
+func (e *Env) PackArgKeysAsString() string {
+	keys := e.Keys()
+	entries := make([]string, len(keys))
+	for i, k := range keys {
+		entries[i] = fmt.Sprintf("%s%s", "--env ", k)
+	}
+	return strings.Join(entries, " ")
+}
+
 //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 {

plugins/config/functions.go

@@ -13,14 +13,15 @@ func export(appName string, global bool, merged bool, format string) error {
 	suffix := "\n"
 
 	exportTypes := map[string]ExportFormat{
-		"exports":          ExportFormatExports,
-		"envfile":          ExportFormatEnvfile,
 		"docker-args":      ExportFormatDockerArgs,
 		"docker-args-keys": ExportFormatDockerArgsKeys,
-		"shell":            ExportFormatShell,
+		"envfile":          ExportFormatEnvfile,
-		"pretty":           ExportFormatPretty,
+		"exports":          ExportFormatExports,
 		"json":             ExportFormatJSON,
 		"json-list":        ExportFormatJSONList,
+		"pack-keys":        ExportFormatPackArgKeys,
+		"pretty":           ExportFormatPretty,
+		"shell":            ExportFormatShell,
 	}
 
 	exportType, ok := exportTypes[format]

plugins/config/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/config
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/config/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/config/src/subcommands/subcommands.go

@@ -49,7 +49,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 | docker-args-keys | shell | pretty | json | json-list ] which format to export as)")
+		format := args.String("format", "exports", "--format: [ docker-args | docker-args-keys | exports | envfile | json | json-list | pack-keys | pretty | shell ] which format to export as)")
 		args.Parse(os.Args[2:])
 		if !*global {
 			appName = args.Arg(0)

plugins/cron/functions.go

@@ -167,7 +167,7 @@ func writeCronEntries() error {
 	command.ShowOutput = false
 	out, err := command.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("Unable to update schedule file: %v", out)
+		return fmt.Errorf("Unable to update schedule file: %s", string(out))
 	}
 
 	common.LogInfo1("Updated schedule file")

plugins/cron/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/cron
 
-go 1.15
+go 1.16
 
 require (
 	github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000

plugins/cron/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core cron plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/docker-options/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/docker-options
 
-go 1.15
+go 1.16
 
 require (
   github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/docker-options/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/domains/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/enter/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/git/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/logs/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/logs
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27

plugins/logs/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/network/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/network
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

plugins/network/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/network/src/subcommands/subcommands.go

@@ -62,10 +62,16 @@ func main() {
 		}
 	case "set":
 		args := flag.NewFlagSet("network:set", flag.ExitOnError)
+		global := args.Bool("global", false, "--global: set a global property")
 		args.Parse(os.Args[2:])
 		appName := args.Arg(0)
 		property := args.Arg(1)
 		value := args.Arg(2)
+		if *global {
+			appName = "--global"
+			property = args.Arg(0)
+			value = args.Arg(1)
+		}
 		err = network.CommandSet(appName, property, value)
 	default:
 		err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand)

plugins/network/subcommands.go

@@ -142,9 +142,11 @@ func CommandReport(appName string, format string, infoFlag string) error {
 
 // CommandSet set or clear a network property for an app
 func CommandSet(appName string, property string, value string) error {
+	if appName != "--global" {
 		if err := common.VerifyAppName(appName); err != nil {
 			return err
 		}
+	}
 
 	if property == "bind-all-interfaces" && value == "" {
 		value = "false"

plugins/nginx-vhosts/dependencies

@@ -7,7 +7,7 @@ nginx_needs_upgrade() {
   local MAJOR_VERSION MINOR_VERSION
   local NEEDS_UPGRADE=true
 
-  if ! which nginx >/dev/null 2>&1; then
+  if ! command -v nginx &>/dev/null; then
     echo $NEEDS_UPGRADE
     return
   fi
@@ -45,7 +45,7 @@ trigger-nginx-vhosts-dependencies() {
         return
       fi
 
-      if ! which nginx >/dev/null 2>&1; then
+      if ! command -v nginx &>/dev/null; then
         nginx_install
         return
       fi

plugins/nginx-vhosts/functions

@@ -128,7 +128,11 @@ validate_nginx() {
 
 restart_nginx() {
   declare desc="restart nginx for given distros"
+  local PROXY_ENABLED="$(plugn trigger proxy-is-enabled "$APP")"
+  local PROXY_TYPE="$(plugn trigger proxy-type "$APP")"
+  if [[ "$PROXY_ENABLED" == "true" ]] && [[ "$PROXY_TYPE" == "nginx" ]]; then
     fn-nginx-vhosts-nginx-init-cmd "reload"
+  fi
 }
 
 nginx_logs() {

plugins/nginx-vhosts/go.mod

@@ -1,3 +1,3 @@
 module github.com/dokku/dokku/plugins/nginx-vhosts
 
-go 1.15
+go 1.16

plugins/nginx-vhosts/internal-functions

@@ -75,7 +75,7 @@ fn-nginx-vhosts-nginx-location() {
   declare desc="check that nginx is at the expected location and return it"
   local NGINX_LOCATION
 
-  NGINX_LOCATION=$(which nginx 2>/dev/null)
+  NGINX_LOCATION=$(command -v nginx 2>/dev/null)
   if [[ -z "$NGINX_LOCATION" ]]; then
     NGINX_LOCATION="/usr/sbin/nginx"
   fi

plugins/nginx-vhosts/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/plugin/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/proxy/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/proxy
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/proxy/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/ps/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/ps
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27

plugins/ps/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/ps/ps.go

@@ -135,6 +135,8 @@ func Start(appName string) error {
 
 	if runningState == "mixed" {
 		common.LogWarn("App is running in mixed mode, releasing")
+	} else if runningState == "false" {
+		common.LogWarn("App has been detected as not running, releasing")
 	}
 
 	if runningState != "true" {

plugins/registry/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/registry
 
-go 1.15
+go 1.16
 
 require (
   github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

plugins/registry/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core registry plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/repo/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/repo
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/repo/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/resource/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/resource
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

plugins/resource/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/run/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core run plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/scheduler-docker-local/install

@@ -14,7 +14,7 @@ trigger-scheduler-docker-local-install() {
 
   fn-plugin-property-setup "scheduler-docker-local"
 
-  DOKKU_PATH="$(which dokku)"
+  DOKKU_PATH="$(command -v dokku)"
 
   if [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then
     cat <<EOF >/etc/systemd/system/dokku-retire.service

plugins/scheduler-docker-local/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/scheduler-null/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-null plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/scheduler/go.mod

@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/scheduler
 
-go 1.15
+go 1.16
 
 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

plugins/shell/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/ssh-keys/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]

plugins/storage/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.26.2"
+version = "0.26.7"
 [plugin.config]