Merge branch 'master' into new-website

2022-07-29 09:34:14 +05:00
parent ddfbdbe6d3 bfe679fb50
commit 40143622ad
110 changed files with 501 additions and 275 deletions
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,7 +54,7 @@ jobs:
      - name: Clone
        uses: actions/checkout@v3
      - name: Run shfmt
-        uses: luizm/action-sh-checker@38985be9e872ef709f8ffca07af3ff88572fe429
+        uses: luizm/action-sh-checker@edd0e45ecff35b05f162052b50df50976c1b74fc
        # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
        env:
          SHFMT_OPTS: -l -bn -ci -i 2 -d
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,85 @@
 # History

+## 0.27.8
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.27.8/bootstrap.sh
+sudo DOKKU_TAG=v0.27.8 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #5232: @YuukiHogo builder-build fix for DOKKU_DOCKERFILE_CACHE_BUILD and DOKKU_DOCKER_BUILD_OPTS variables
+
+### New Features
+
+- #5255: @josegonzalez export DOKKU_COMMAND for use in authentication systems
+
+### Other
+
+- #5250: @dependabot[bot] chore(deps): bump flask from 2.1.2 to 2.1.3 in /tests/apps/multi
+- #5251: @dependabot[bot] chore(deps): bump flask from 2.1.2 to 2.1.3 in /tests/apps/python-flask
+- #5245: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 221 to 222 in /tests/apps/php
+
+## 0.27.7
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.27.7/bootstrap.sh
+sudo DOKKU_TAG=v0.27.7 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #5238: @josegonzalez Respect dokku system user/group when setting storage permissions on installation
+
+### New Features
+
+- #5239: @josegonzalez Add builder-type and image-stage labels to all images
+
+### Documentation
+
+- #5241: @josegonzalez Clarify where logs are pulled from and general log shipping stance
+- #5237: @josegonzalez Fix builder-pack:set command example
+
+### Other
+
+- #5235: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 220 to 221 in /tests/apps/php
+
+## 0.27.6
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.27.6/bootstrap.sh
+sudo DOKKU_TAG=v0.27.6 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #5225: @josegonzalez Use original app name when setting include_labels for vector source
+- #5228: @josegonzalez Always respect app.json formations in scale settings
+- #5201: @josegonzalez Use pack as default builder for arm64 servers
+
+### Documentation
+
+- #5230: @josegonzalez Clarify usage of build args to set environment variables for Dockerfile deploys
+- #5208: @asokoloski-m Fix typo in dockerfile builder docs
+- #5206: @AxelTheGerman Added dokku-litestream to list of community plugins
+
+### Other
+
+- #5218: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 219 to 220 in /tests/apps/php
+- #5222: @dependabot[bot] chore(deps): bump jetty-servlet from 11.0.10 to 11.0.11 in /tests/apps/java
+- #5224: @josegonzalez Document that the community registry plugin should be uninstalled before upgrading past 0.24.x
+- #5220: @dependabot[bot] chore(deps): bump jetty-servlet from 11.0.9 to 11.0.10 in /tests/apps/java
+- #5212: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 218 to 219 in /tests/apps/php
+- #5210: @dependabot[bot] chore(deps): bump monolog/monolog from 1.27.0 to 1.27.1 in /tests/apps/php
+- #5204: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 217 to 218 in /tests/apps/php
+
 ## 0.27.5

 Install/update via the bootstrap script:
--- a/README.md
+++ b/README.md
@@ -87,8 +87,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.27.5/bootstrap.sh
-sudo DOKKU_TAG=v0.27.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.27.8/bootstrap.sh
+sudo DOKKU_TAG=v0.27.8 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.
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -212,7 +212,7 @@ install-dokku-from-deb-package() {
  fi

  echo "--> Installing dokku"
-  wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+  wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
  echo "deb https://packagecloud.io/dokku/dokku/$DOKKU_DISTRO/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
  apt-get update -qq >/dev/null

--- a/deb.mk
+++ b/deb.mk
@@ -19,7 +19,7 @@ install-from-deb:
 	wget -nv -O - https://get.docker.com/ | sh

 	@echo "--> Installing dokku"
-	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+	wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
 	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "bionic") main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq >/dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install dokku
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.27.5
+Version: 0.27.8
 Section: web
 Priority: optional
 Architecture: amd64
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -35,35 +35,35 @@ dokku plugin:list

 ```
 plugn: dev
-  00_dokku-standard    0.27.5 enabled    dokku core standard plugin
-  20_events            0.27.5 enabled    dokku core events logging plugin
-  app-json             0.27.5 enabled    dokku core app-json plugin
-  apps                 0.27.5 enabled    dokku core apps plugin
-  build-env            0.27.5 enabled    dokku core build-env plugin
-  buildpacks           0.27.5 enabled    dokku core buildpacks plugin
-  certs                0.27.5 enabled    dokku core certificate management plugin
-  checks               0.27.5 enabled    dokku core checks plugin
-  common               0.27.5 enabled    dokku core common plugin
-  config               0.27.5 enabled    dokku core config plugin
-  docker-options       0.27.5 enabled    dokku core docker-options plugin
-  domains              0.27.5 enabled    dokku core domains plugin
-  enter                0.27.5 enabled    dokku core enter plugin
-  git                  0.27.5 enabled    dokku core git plugin
-  logs                 0.27.5 enabled    dokku core logs plugin
-  network              0.27.5 enabled    dokku core network plugin
-  nginx-vhosts         0.27.5 enabled    dokku core nginx-vhosts plugin
-  plugin               0.27.5 enabled    dokku core plugin plugin
-  proxy                0.27.5 enabled    dokku core proxy plugin
-  ps                   0.27.5 enabled    dokku core ps plugin
-  repo                 0.27.5 enabled    dokku core repo plugin
-  resource             0.27.5 enabled    dokku core resource plugin
-  scheduler-docker-local 0.27.5 enabled    dokku core scheduler-docker-local plugin
-  shell                0.27.5 enabled    dokku core shell plugin
-  ssh-keys             0.27.5 enabled    dokku core ssh-keys plugin
-  storage              0.27.5 enabled    dokku core storage plugin
-  tags                 0.27.5 enabled    dokku core tags plugin
-  tar                  0.27.5 enabled    dokku core tar plugin
-  trace                0.27.5 enabled    dokku core trace plugin
+  00_dokku-standard    0.27.8 enabled    dokku core standard plugin
+  20_events            0.27.8 enabled    dokku core events logging plugin
+  app-json             0.27.8 enabled    dokku core app-json plugin
+  apps                 0.27.8 enabled    dokku core apps plugin
+  build-env            0.27.8 enabled    dokku core build-env plugin
+  buildpacks           0.27.8 enabled    dokku core buildpacks plugin
+  certs                0.27.8 enabled    dokku core certificate management plugin
+  checks               0.27.8 enabled    dokku core checks plugin
+  common               0.27.8 enabled    dokku core common plugin
+  config               0.27.8 enabled    dokku core config plugin
+  docker-options       0.27.8 enabled    dokku core docker-options plugin
+  domains              0.27.8 enabled    dokku core domains plugin
+  enter                0.27.8 enabled    dokku core enter plugin
+  git                  0.27.8 enabled    dokku core git plugin
+  logs                 0.27.8 enabled    dokku core logs plugin
+  network              0.27.8 enabled    dokku core network plugin
+  nginx-vhosts         0.27.8 enabled    dokku core nginx-vhosts plugin
+  plugin               0.27.8 enabled    dokku core plugin plugin
+  proxy                0.27.8 enabled    dokku core proxy plugin
+  ps                   0.27.8 enabled    dokku core ps plugin
+  repo                 0.27.8 enabled    dokku core repo plugin
+  resource             0.27.8 enabled    dokku core resource plugin
+  scheduler-docker-local 0.27.8 enabled    dokku core scheduler-docker-local plugin
+  shell                0.27.8 enabled    dokku core shell plugin
+  ssh-keys             0.27.8 enabled    dokku core ssh-keys plugin
+  storage              0.27.8 enabled    dokku core storage plugin
+  tags                 0.27.8 enabled    dokku core tags plugin
+  tar                  0.27.8 enabled    dokku core tar plugin
+  trace                0.27.8 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.
--- a/docs/appendices/0.25.0-migration-guide.md
+++ b/docs/appendices/0.25.0-migration-guide.md
@@ -9,6 +9,8 @@ The [dokku-registry](https://github.com/dokku/dokku-registry) plugin is now buil
 - At this time, remote docker repositories are not automatically created for AWS, and users must create those repositories for their applications as necessary. This may be implemented in the future.
 - Docker images are only pushed when configured to do so. See the [registry management documentation](/docs/deployment/registry-management.md) for more details.

+Before upgrading, uninstall the registry plugin via `dokku plugin:uninstall registry`. Not doing so will cause issues with Dokku.
+
 ## Other

 ### Changes
--- 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.27.5/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-310x150.png"/>
      <TileColor>#da532c</TileColor>
    </tile>
  </msapplication>
--- 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.27.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.8\/docs\/assets\/favicons\/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0"
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -81,6 +81,7 @@ a:hover>.cta-arrow .cta-arrow__tip {
 .navbar-toggler:focus {
  border: none;
  box-shadow: none;
+
 }

 .navbar-brand {
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -24,6 +24,6 @@
    "0.24.10",
    "0.25.7",
    "0.26.8",
-    "0.27.5"
+    "0.27.8"
  ]
 }
--- a/docs/community/plugins.md
+++ b/docs/community/plugins.md
@@ -102,6 +102,7 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
 | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
+| [Litestream](https://github.com/AxelTheGerman/dokku-litestream)<sup>2</sup>                       | [AxelTheGerman][]     | 0.27.0+               |
 | [Monit (Health Checks)](https://github.com/mbreit/dokku-monit)                                    | [mbreit][]            | 0.8.0+                |
 | [Nuke Containers](https://github.com/josegonzalez/dokku-nuke)                                     | [josegonzalez][]      | 0.4.0+                |
 | [Open App Ports](https://github.com/josegonzalez/dokku-ports)                                     | [josegonzalez][]      | 0.3.x                 |
@@ -116,13 +117,15 @@ The following plugins are available and provided by Dokku maintainers.  Please f

 <sup>1</sup> Extends app.json support to include creating volumes and creating / linking databases on push

-<sup>2</sup> Adds the possibility to add SSH deployment keys to receive private hosted packages
+<sup>2</sup> Adds SQLite replication to external object storage via [Litestream](https://litestream.io)

-<sup>3</sup> Adds the ability to add custom hosts to the containers known_hosts file to be able to ssh them easily (useful with deployment keys)
+<sup>3</sup> Adds the possibility to add SSH deployment keys to receive private hosted packages

-<sup>4</sup> Adds the ability to sync an application repo with a remote GitHub repo (useful for automated rebuilds without needing a git push from an external system
+<sup>4</sup> Adds the ability to add custom hosts to the containers known_hosts file to be able to ssh them easily (useful with deployment keys)

-<sup>5</sup> Adds the ability to invoke a post-deploy webhook with the IP, port and app name, all with a single config:set).
+<sup>5</sup> Adds the ability to sync an application repo with a remote GitHub repo (useful for automated rebuilds without needing a git push from an external system
+
+<sup>6</sup> Adds the ability to invoke a post-deploy webhook with the IP, port and app name, all with a single config:set).

 ### Other Plugins

@@ -238,6 +241,7 @@ The following plugins are no longer maintained by their developers.
 [aomitayo]: https://github.com/aomitayo
 [apmorton]: https://github.com/apmorton
 [artofrawr]: https://github.com/artofrawr
+[AxelTheGerman]: https://github.com/AxelTheGerman
 [badsyntax]: https://github.com/badsyntax
 [basgys]: https://github.com/basgys
 [benjamin-dobell]: https://github.com/benjamin-dobell
--- a/docs/configuration/environment-variables.md
+++ b/docs/configuration/environment-variables.md
@@ -14,7 +14,7 @@ config:keys (<app>|--global) [--merged]
 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
 ```
-> For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available _only_ during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
+> For 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). Consider using [build arguments](/docs/deployment/builders/dockerfiles.md#build-time-configuration-variables) to expose variables during build-time for Dockerfile apps.

 Environment variables are available both at run time and during the application build/compilation step for buildpack-based deploys.

--- a/docs/deployment/builders/cloud-native-buildpacks.md
+++ b/docs/deployment/builders/cloud-native-buildpacks.md
@@ -84,7 +84,7 @@ dokku builder-pack:set --global projecttoml-path
 You can get a report about the app's storage status using the `builder-pack:report` command:

 ```shell
-dokku app-json:report
+dokku builder-pack:report
 ```

 ```
--- a/docs/deployment/builders/dockerfiles.md
+++ b/docs/deployment/builders/dockerfiles.md
@@ -62,7 +62,7 @@ dokku builder-dockerfile:set --global dockerfile-path
 You can get a report about the app's storage status using the `builder-dockerfile:report` command:

 ```shell
-dokku app-json:report
+dokku builder-dockerfile:report
 ```

 ```
--- a/docs/deployment/logs.md
+++ b/docs/deployment/logs.md
@@ -20,6 +20,8 @@ You can easily get logs of an app using the `logs` command:
 dokku logs node-js-app
 ```

+Logs are pulled via integration with the scheduler for the specified application via "live tailing". As such, logs from previously running deployments are usually not available. Users that desire to see logs from previous deployments for debugging purposes should persist those logs to external services. Please see Dokku's [vector integration](deployment/logs.md#vector-logging-shipping) for more information on how to persist logs across deployments to ship logs to another service or a third-party platform.
+
 #### Behavioral modifiers

 Dokku also supports certain command-line arguments that augment the `log` command's behavior.
--- a/docs/deployment/schedulers/docker-local.md
+++ b/docs/deployment/schedulers/docker-local.md
@@ -91,7 +91,11 @@ Omitting or removing the entry will result in parallelism for that process type

 Note that increasing the value of `max_parallel` may significantly impact CPU utilization on your host as your app containers - and their respective processes - start up. Setting a value higher than the number of available CPUs is discouraged. It is recommended that users carefully set this value so as not to overburden their server.

-## Implemented Triggers
+## Scheduler Interface
+
+The following sections describe implemented scheduler functionality for the `docker-local` scheduler.
+
+### Implemented Commands and Triggers

 This plugin implements various functionality through `plugn` triggers to integrate with Docker for running apps on a single server. The following functionality is supported by the `scheduler-docker-local` plugin.

@@ -105,11 +109,16 @@ This plugin implements various functionality through `plugn` triggers to integra
 - `ps:stop`
 - `run`

-## Supported Resource Management Properties
+
+### Logging support
+
+App logs for the `logs` command are fetched from running containers via the `docker` cli. To persist logs across deployments, consider using Dokku's [vector integration](deployment/logs.md#vector-logging-shipping) to ship logs to another service or a third-party platform.
+
+### Supported Resource Management Properties

 The `docker-local` scheduler supports a minimal list of resource _limits_ and _reservations_. The following properties are supported:

-### Resource Limits
+#### Resource Limits

 - cpu: (docker option: `--cpus`), is specified in number of CPUs a process can access.
  - See the ["CPU" section](https://docs.docker.com/config/containers/resource_constraints/#cpu) of the Docker Runtime Options documentation for more information.
@@ -120,7 +129,7 @@ The `docker-local` scheduler supports a minimal list of resource _limits_ and _r
 - nvidia-gpus: (docker option: `--gpus`), is specified in number of Nvidia GPUs a process can access.
  - See the ["GPU" section](https://docs.docker.com/config/containers/resource_constraints/#gpu) of the Docker Runtime Options documentation for more information.

-### Resource Reservations
+#### Resource Reservations

 - memory: (docker option: `--memory-reservation`) should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes). Default unit is `m` (megabytes).
  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.
--- a/docs/deployment/schedulers/kubernetes.md
+++ b/docs/deployment/schedulers/kubernetes.md
@@ -2,13 +2,23 @@

 > Warning: This scheduler is not in Dokku core and thus functionality may change over time as the API stabilizes.

-The [Kubernetes Scheduler Plugin](https://github.com/dokku/dokku-scheduler-kubernetes) implements the following functionality:
+The [Nomad Scheduler Plugin](https://github.com/dokku/dokku-scheduler-kubernetes) is available free as an external plugin. Please see the plugin's [issue tracker](https://github.com/dokku/dokku-scheduler-kubernetes/issues) for more information on the status of the plugin.
+
+For users that require additional functionality, please refer to the [Sponsoring Documentation](https://github.com/dokku/.github/blob/master/SPONSORING.md).
+
+## Scheduler Interface
+
+The following sections describe implemented scheduler functionality for the `docker-local` scheduler.
+
+### Implemented Commands and Triggers
+
+This plugin implements various functionality through `plugn` triggers to integrate with `kubectl` for running apps on a Kubernetes cluster. The following functionality is supported by the `scheduler-kubernetes` plugin.

 - `apps:destroy`
 - `deploy`: partial, does not implement failed deploy log capture
 - `logs`: partial, does not implement failure logs
 - `ps:stop`

-Please see the plugin's [issue tracker](https://github.com/dokku/dokku-scheduler-kubernetes/issues) for more information on the status of the plugin.
+### Logging support

-For users that require additional functionality, please refer to the [Sponsoring Documentation](https://github.com/dokku/.github/blob/master/SPONSORING.md).
+App logs for the `logs` command are fetched from running pods via the `kubectl` cli. To persist logs across deployments, consider using [Vector](https://vector.dev/docs/setup/installation/platforms/kubernetes/) or a similar tool to ship logs to another service or a third-party platform.
--- a/docs/deployment/schedulers/nomad.md
+++ b/docs/deployment/schedulers/nomad.md
@@ -2,12 +2,22 @@

 > Warning: This scheduler is not in Dokku core and thus functionality may change over time as the API stabilizes.

-The [Nomad Scheduler Plugin](https://github.com/dokku/dokku-scheduler-nomad) implements the following functionality:
+The [Nomad Scheduler Plugin](https://github.com/dokku/dokku-scheduler-nomad) is available free as an external plugin. Please see the plugin's [issue tracker](https://github.com/dokku/dokku-scheduler-nomad/issues) for more information on the status of the plugin.
+
+For users that require additional functionality, please refer to the [Sponsoring Documentation](https://github.com/dokku/.github/blob/master/SPONSORING.md).
+
+## Scheduler Interface
+
+The following sections describe implemented scheduler functionality for the `docker-local` scheduler.
+
+### Implemented Commands and Triggers
+
+This plugin implements various functionality through `plugn` triggers to integrate with the `nomad` cli for running apps on a Nomad cluster. The following functionality is supported by the `scheduler-nomad` plugin.

 - `apps:destroy`
 - `deploy`
 - `ps:stop`

-Please see the plugin's [issue tracker](https://github.com/dokku/dokku-scheduler-nomad/issues) for more information on the status of the plugin.
+### Logging support

-For users that require additional functionality, please refer to the [Sponsoring Documentation](https://github.com/dokku/.github/blob/master/SPONSORING.md).
+> Warning: Fetching app logs for the `logs` command is currently not implemented. Please consider using [Vector](https://vector.dev/docs/setup/installation/platforms/kubernetes/) or a similar tool to ship logs to another service or a third-party platform.
--- 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.27.5-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.27.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'
--- a/docs/getting-started/install/debian.md
+++ b/docs/getting-started/install/debian.md
@@ -11,7 +11,7 @@ sudo apt-get -qq -y --no-install-recommends install apt-transport-https
 wget -nv -O - https://get.docker.com/ | sh

 # install dokku
-wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
 OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
 echo "bionic focal jammy" | grep -q "$OS_ID" || OS_ID="bionic"
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list
--- a/docs/getting-started/install/docker.md
+++ b/docs/getting-started/install/docker.md
@@ -3,7 +3,7 @@
 Pull the dokku/dokku image:

 ```shell
-docker pull dokku/dokku:0.27.5
+docker pull dokku/dokku:0.27.8
 ```

 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.27.5
+  dokku/dokku:0.27.8
 ```

 The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears.
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -39,8 +39,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.27.5/bootstrap.sh;
-sudo DOKKU_TAG=v0.27.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.27.8/bootstrap.sh;
+sudo DOKKU_TAG=v0.27.8 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,26 +10,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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.8/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
@@ -38,11 +38,8 @@
    <link rel="preconnect" href="https://fonts.googleapis.com">
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
    <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="./assets/style.css" rel="stylesheet"> -->
-    <style>
-
-    </style>
 </head>

 <body>
@@ -127,7 +124,7 @@
                            </p>
                            <p class="line">
                                <span class="prompt">$</span>
-                                <span class="command">sudo DOKKU_TAG=v0.27.4 bash bootstrap.sh</span>
+                                <span class="command">sudo DOKKU_TAG=v0.27.8 bash bootstrap.sh</span>
                            </p>
                            <br>
                            <p class="line">
--- a/docs/template.html
+++ b/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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.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.27.8/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.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.27.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <script>
@@ -48,11 +48,9 @@
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
    <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap" rel="stylesheet">
    
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.27.8/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="./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>
-    </style>
  </head>
  <body>
    <div class="dev-warning doc-floating-warning" style="display:none">
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/app-json/functions.go
+++ b/plugins/app-json/functions.go
@@ -497,7 +497,7 @@ func setScale(appName string, image string) error {
 	}

 	skipDeploy := true
-	clearExisting := false
+	clearExisting := true
 	args := []string{appName, strconv.FormatBool(skipDeploy), strconv.FormatBool(clearExisting)}
 	for processType, formation := range appJSON.Formation {
 		if formation.Quantity != nil {
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -17,7 +17,9 @@ trigger-builder-dockerfile-builder-build() {
  dokku_log_info1 "Building $APP from Dockerfile"

  local IMAGE=$(get_app_image_name "$APP")
-  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" "--label=com.dokku.image-stage=build")
+  local DOKKU_DOCKERFILE_CACHE_BUILD=$(config_get "$APP" "DOKKU_DOCKERFILE_CACHE_BUILD")
+  local DOKKU_DOCKER_BUILD_OPTS=$(config_get "$APP" "DOKKU_DOCKER_BUILD_OPTS")
+  local DOCKER_BUILD_LABEL_ARGS=("--label=dokku" "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=build" "--label=com.dokku.builder-type=dockerfile" "--label=com.dokku.app-name=$APP")

  pushd "$SOURCECODE_WORK_DIR" &>/dev/null

@@ -36,7 +38,7 @@ trigger-builder-dockerfile-builder-build() {
  declare -a ARG_ARRAY
  eval "ARG_ARRAY=($DOCKER_ARGS)"

-  "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
+  "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" ${DOKKU_DOCKER_BUILD_OPTS} -t $IMAGE .

  plugn trigger post-build-dockerfile "$APP"
 }
--- a/plugins/builder-dockerfile/plugin.toml
+++ b/plugins/builder-dockerfile/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-dockerfile plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/builder-herokuish/builder-build
+++ b/plugins/builder-herokuish/builder-build
@@ -23,8 +23,8 @@ trigger-builder-herokuish-builder-build() {
  local IMAGE=$(get_app_image_name "$APP")
  local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
  local DOKKU_APP_HOST_CACHE_DIR="$DOKKU_HOST_ROOT/$APP/cache"
-  local DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$APP")
-  local DOCKER_RUN_LABEL_ARGS=("--label=com.dokku.image-stage=build" "--label=com.dokku.app-name=$APP")
+  local DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL dokku=" "--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.image-stage=build" "--change" "LABEL com.dokku.builder-type=herokuish" "--change" "LABEL com.dokku.app-name=$APP")
+  local DOCKER_RUN_LABEL_ARGS=("--label=dokku" "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=build" "--label=com.dokku.builder-type=herokuish" "--label=com.dokku.app-name=$APP")
  local CID TAR_CID

  pushd "$SOURCECODE_WORK_DIR" &>/dev/null
--- a/plugins/builder-herokuish/plugin.toml
+++ b/plugins/builder-herokuish/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-herokuish plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/builder-null/plugin.toml
+++ b/plugins/builder-null/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-null plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/builder-pack/builder-build
+++ b/plugins/builder-pack/builder-build
@@ -33,7 +33,7 @@ trigger-builder-pack-builder-build() {

  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[@]}"
-  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"
+  docker-image-labeler --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE"

  plugn trigger post-build-pack "$APP" "$SOURCECODE_WORK_DIR"
 }
--- a/plugins/builder-pack/plugin.toml
+++ b/plugins/builder-pack/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-pack plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/builder/plugin.toml
+++ b/plugins/builder/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -743,6 +743,7 @@ dokku_auth() {
  declare desc="calls user-auth plugin trigger"
  export SSH_USER=${SSH_USER:=$USER}
  export SSH_NAME=${NAME:="default"}
+  export DOKKU_COMMAND="$1"

  local user_auth_count=$(find "$PLUGIN_PATH"/enabled/*/user-auth 2>/dev/null | wc -l)

--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/cron/plugin.toml
+++ b/plugins/cron/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core cron plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -58,7 +58,19 @@ git_trigger_build() {
  plugn trigger post-extract "$APP" "$TMP_WORK_DIR" "$REV"

  BUILDER="$(plugn trigger builder-detect "$APP" "$TMP_WORK_DIR" | head -n1 || true)"
-  [[ -z "$BUILDER" ]] && BUILDER="herokuish"
+  if [[ -z "$BUILDER" ]]; then
+    BUILDER="herokuish"
+    local ARCHITECTURE="$(dpkg --print-architecture 2>/dev/null || true)"
+    if [[ "$ARCHITECTURE" == "arm64" ]]; then
+      dokku_log_warn "Herokuish builder not supported on $ARCHITECTURE servers."
+      dokku_log_warn "Switching to pack builder."
+      BUILDER="pack"
+    elif [[ "$ARCHITECTURE" == "armhf" ]]; then
+      dokku_log_warn "Herokuish builder not supported on $ARCHITECTURE servers."
+      dokku_log_warn "Consider using a Dockerfile to build your app."
+      return 1
+    fi
+  fi

  plugn trigger pre-receive-app "$APP" "$BUILDER" "$TMP_WORK_DIR" "$REV"
  dokku_receive "$APP" "$BUILDER" "$TMP_WORK_DIR"
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/logs/functions.go
+++ b/plugins/logs/functions.go
@@ -168,18 +168,18 @@ func writeVectorConfig() error {
 			continue
 		}

-		appName = strings.ReplaceAll(appName, ".", "-")
-		sink, err := sinkValueToConfig(appName, value)
+		inflectedAppName := strings.ReplaceAll(appName, ".", "-")
+		sink, err := sinkValueToConfig(inflectedAppName, value)
 		if err != nil {
 			return err
 		}

-		data.Sources[fmt.Sprintf("docker-source:%s", appName)] = vectorSource{
+		data.Sources[fmt.Sprintf("docker-source:%s", inflectedAppName)] = vectorSource{
 			Type:          "docker_logs",
 			IncludeLabels: []string{fmt.Sprintf("com.dokku.app-name=%s", appName)},
 		}

-		data.Sinks[fmt.Sprintf("docker-sink:%s", appName)] = sink
+		data.Sinks[fmt.Sprintf("docker-sink:%s", inflectedAppName)] = sink
 	}

 	value := common.PropertyGet("logs", "--global", "vector-sink")
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -44,7 +44,6 @@ server {
  }

  {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }}
-  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;

  error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
  location /400-error.html {
@@ -64,6 +63,7 @@ server {
    internal;
  }
 {{ end }}
+  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
 }
 {{ else if eq $scheme "https"}}
 server {
@@ -110,7 +110,6 @@ server {
  }

  {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }}
-  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;

  error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
  location /400-error.html {
@@ -135,6 +134,7 @@ server {
    root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
    internal;
  }
+  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
 }
 {{ else if eq $scheme "grpc"}}
 {{ if eq $.GRPC_SUPPORTED "true"}}{{ if eq $.HTTP2_SUPPORTED "true"}}
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/registry/plugin.toml
+++ b/plugins/registry/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core registry plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/run/plugin.toml
+++ b/plugins/run/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core run plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/scheduler-null/plugin.toml
+++ b/plugins/scheduler-null/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-null plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/scheduler/plugin.toml
+++ b/plugins/scheduler/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- 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.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/storage/install
+++ b/plugins/storage/install
@@ -5,9 +5,9 @@ set -eo pipefail
 trigger-storage-install() {
  declare desc="storage install trigger"
  declare trigger="install"
-  local storage_directory="${DOKKU_LIB_ROOT}/data/storage"
-  mkdir -p "${storage_directory}"
-  chown dokku:dokku "${storage_directory}"
+
+  mkdir -p "${DOKKU_LIB_ROOT}/data/storage"
+  chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/storage"

  STORAGE_SUDOERS_FILE="/etc/sudoers.d/dokku-storage"
  local mode="0440"
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.27.5"
+version = "0.27.8"
 [plugin.config]
--- a/tests/apps/java/pom.xml
+++ b/tests/apps/java/pom.xml
@@ -10,7 +10,7 @@
        <dependency>
            <groupId>org.eclipse.jetty</groupId>
            <artifactId>jetty-servlet</artifactId>
-            <version>11.0.9</version>
+            <version>11.0.11</version>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
--- a/tests/apps/multi/requirements.txt
+++ b/tests/apps/multi/requirements.txt
@@ -1,2 +1,2 @@
-Flask==2.1.2
+Flask==2.1.3
 gunicorn==20.1.0
--- a/tests/apps/php/composer.lock
+++ b/tests/apps/php/composer.lock
@@ -8,16 +8,16 @@
    "packages": [
        {
            "name": "monolog/monolog",
-            "version": "1.27.0",
+            "version": "1.27.1",
            "source": {
                "type": "git",
                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a"
+                "reference": "904713c5929655dc9b97288b69cfeedad610c9a1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
-                "reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1",
+                "reference": "904713c5929655dc9b97288b69cfeedad610c9a1",
                "shasum": ""
            },
            "require": {
@@ -86,7 +86,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-13T20:29:46+00:00"
+            "time": "2022-06-09T08:53:42+00:00"
        },
        {
            "name": "paragonie/random_compat",
@@ -427,6 +427,7 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
+            "abandoned": "symfony/error-handler",
            "time": "2019-10-24T15:33:53+00:00"
        },
        {
@@ -1000,16 +1001,16 @@
    "packages-dev": [
        {
            "name": "heroku/heroku-buildpack-php",
-            "version": "v217",
+            "version": "v222",
            "source": {
                "type": "git",
                "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "5e95230f28b8d2375b27cc54cf3d78ef885f5b78"
+                "reference": "202c2a14e40f8db277ae963c41aeb26e46f18d94"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/5e95230f28b8d2375b27cc54cf3d78ef885f5b78",
-                "reference": "5e95230f28b8d2375b27cc54cf3d78ef885f5b78",
+                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/202c2a14e40f8db277ae963c41aeb26e46f18d94",
+                "reference": "202c2a14e40f8db277ae963c41aeb26e46f18d94",
                "shasum": ""
            },
            "bin": [
@@ -1037,7 +1038,7 @@
                "nginx",
                "php"
            ],
-            "time": "2022-05-18T19:16:45+00:00"
+            "time": "2022-07-07T18:16:23+00:00"
        }
    ],
    "aliases": [],
--- a/tests/apps/python-flask/requirements.txt
+++ b/tests/apps/python-flask/requirements.txt
@@ -1,5 +1,5 @@
-Flask==2.1.2
+Flask==2.1.3
 Jinja2==3.1.2
-Werkzeug==2.1.2
+Werkzeug==2.2.1
 gunicorn==20.1.0

--- a/tests/apps/python/app-5205a.json
+++ b/tests/apps/python/app-5205a.json
@@ -0,0 +1,10 @@
+{
+  "formation": {
+    "web": {
+      "quantity": 1
+    },
+    "worker": {
+      "quantity": 1
+    }
+  }
+}
--- a/tests/apps/python/app-5205b.json
+++ b/tests/apps/python/app-5205b.json
@@ -0,0 +1,10 @@
+{
+  "formation": {
+    "web": {
+      "quantity": 1
+    },
+    "cron": {
+      "quantity": 1
+    }
+  }
+}
--- a/tests/apps/ruby/Gemfile
+++ b/tests/apps/ruby/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 ruby '2.6.8'

-gem 'sinatra', '~>2.2.0'
+gem 'sinatra', '~>2.2.2'
 gem 'thin'
--- a/tests/apps/ruby/Gemfile.lock
+++ b/tests/apps/ruby/Gemfile.lock
@@ -3,26 +3,26 @@ GEM
  specs:
    daemons (1.4.0)
    eventmachine (1.2.7)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
      ruby2_keywords (~> 0.0.1)
-    rack (2.2.3.1)
-    rack-protection (2.2.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
      rack
    ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
      rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.2)
      tilt (~> 2.0)
    thin (1.8.1)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
      rack (>= 1, < 3)
-    tilt (2.0.10)
+    tilt (2.0.11)

 PLATFORMS
  ruby

 DEPENDENCIES
-  sinatra (~> 2.2.0)
+  sinatra (~> 2.2.2)
  thin
--- a/tests/unit/app-json-2.bats
+++ b/tests/unit/app-json-2.bats
@@ -65,4 +65,3 @@ teardown() {
  echo "status: $status"
  assert_success
 }
-
--- a/tests/unit/app-json-3.bats
+++ b/tests/unit/app-json-3.bats
@@ -0,0 +1,83 @@
+#!/usr/bin/env bats
+load test_helper
+
+setup() {
+  global_setup
+  create_app
+}
+
+teardown() {
+  destroy_app
+  global_teardown
+}
+
+@test "(app-json) persist scale" {
+  local CUSTOM_TMP=$(mktemp -d "/tmp/dokku.me.XXXXX")
+  trap 'popd &>/dev/null || true; rm -rf "$TMP"' INT TERM
+
+  CUSTOM_TMP="$CUSTOM_TMP" run deploy_app python dokku@dokku.me:$TEST_APP persist_scale_callback_a
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku --quiet ps:scale $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "web:  1"
+  assert_output_contains "worker: 1"
+  assert_output_contains "cron: 0" 0
+
+  run persist_scale_callback_b "$TEST_APP" "$CUSTOM_TMP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run git -C "$CUSTOM_TMP" add app.json Procfile
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run git -C "$CUSTOM_TMP" commit -m 'Update scaling parameters'
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run git -C "$CUSTOM_TMP" push target master:master
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku --quiet ps:scale $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "web:  1"
+  assert_output_contains "worker: 1" 0
+  assert_output_contains "worker: 0" 0
+  assert_output_contains "cron: 1" 1
+}
+
+persist_scale_callback_a() {
+  local APP="$1"
+  local APP_REPO_DIR="$2"
+  [[ -z "$APP" ]] && local APP="$TEST_APP"
+
+  rm "$APP_REPO_DIR/Procfile"
+  touch "$APP_REPO_DIR/Procfile"
+  echo "web: python3 web.py" >>"$APP_REPO_DIR/Procfile"
+  echo "worker: python3 worker.py" >>"$APP_REPO_DIR/Procfile"
+  mv "$APP_REPO_DIR/app-5205a.json" "$APP_REPO_DIR/app.json"
+}
+
+persist_scale_callback_b() {
+  local APP="$1"
+  local APP_REPO_DIR="$2"
+  [[ -z "$APP" ]] && local APP="$TEST_APP"
+
+  rm "$APP_REPO_DIR/Procfile"
+  touch "$APP_REPO_DIR/Procfile"
+  echo "web: python3 web.py" >>"$APP_REPO_DIR/Procfile"
+  echo "cron: python3 worker.py" >>"$APP_REPO_DIR/Procfile"
+  mv "$APP_REPO_DIR/app-5205b.json" "$APP_REPO_DIR/app.json"
+}
--- a/tests/unit/app-json.bats
+++ b/tests/unit/app-json.bats
@@ -37,7 +37,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  CID=$(docker ps -a -q  -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
+  CID=$(docker ps -a -q -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
  DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$TEST_APP")
  IMAGE_ID=$(docker commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" $CID dokku-test/${TEST_APP})
  run /bin/bash -c "docker run --rm $IMAGE_ID ls /app/postdeploy.test"
--- a/tests/unit/apps_1.bats
+++ b/tests/unit/apps_1.bats
@@ -140,7 +140,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_output ""
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
  echo "output: $output"
  echo "status: $status"
  assert_output ""
--- a/tests/unit/apps_2.bats
+++ b/tests/unit/apps_2.bats
@@ -20,7 +20,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
  echo "output: $output"
  echo "status: $status"
  assert_output ""
@@ -140,11 +140,11 @@ teardown() {
  assert_failure
  run [ -f /home/dokku/great-test-name/VHOST ]
  assert_failure
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
  echo "output: $output"
  echo "status: $status"
  assert_failure
@@ -152,7 +152,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
  echo "output: $output"
  echo "status: $status"
  assert_success
--- a/tests/unit/build-env.bats
+++ b/tests/unit/build-env.bats
@@ -84,7 +84,7 @@ teardown() {
@test "(build-env) DOKKU_HOST_ROOT cache bind is used if set" {
  TMP_ROOT=$(mktemp -d)
  mkdir -p $DOKKU_ROOT/.dokkurc
-  echo export DOKKU_HOST_ROOT="$TMP_ROOT" > $DOKKU_ROOT/.dokkurc/HOST_ROOT
+  echo export DOKKU_HOST_ROOT="$TMP_ROOT" >$DOKKU_ROOT/.dokkurc/HOST_ROOT
  DOKKU_HOST_ROOT="$TMP_ROOT" deploy_app

  BUILD_CID=$(docker ps -a | grep $TEST_APP | grep /bin/bash | awk '{print $1}' | head -n1)
--- a/tests/unit/builder-herokuish.bats
+++ b/tests/unit/builder-herokuish.bats
@@ -16,4 +16,4 @@ teardown() {
  echo "status: $status"
  assert_success
  assert_output_contains 'DOTENV_KEY=some_value'
-}
+}
--- a/tests/unit/buildpacks.bats
+++ b/tests/unit/buildpacks.bats
@@ -233,7 +233,6 @@ teardown() {
  assert_output_not_exists
 }

-
@test "(buildpacks) buildpacks:clear" {
  run /bin/bash -c "dokku buildpacks:set $TEST_APP heroku/nodejs"
  echo "output: $output"
--- a/tests/unit/client.bats
+++ b/tests/unit/client.bats
@@ -189,7 +189,7 @@ teardown() {
  echo "status: $status"
  assert_success
  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
    echo "output: $output"
    echo "status: $status"
    assert_success
@@ -203,7 +203,7 @@ teardown() {
  echo "status: $status"
  assert_success
  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
    echo "output: $output"
    echo "status: $status"
    assert_failure
@@ -217,7 +217,7 @@ teardown() {
  echo "status: $status"
  assert_success
  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
    echo "output: $output"
    echo "status: $status"
    assert_success
--- a/tests/unit/config-oddities.bats
+++ b/tests/unit/config-oddities.bats
@@ -12,7 +12,7 @@ setup() {
 teardown() {
  destroy_app
  ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
+  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
    mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
  fi
  global_teardown
--- a/tests/unit/config.bats
+++ b/tests/unit/config.bats
@@ -12,7 +12,7 @@ setup() {
 teardown() {
  destroy_app
  ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
+  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
    mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
  fi
  global_teardown
--- a/tests/unit/core_1.bats
+++ b/tests/unit/core_1.bats
@@ -34,7 +34,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  sleep 5  # wait for dokku cleanup to happen in the background
+  sleep 5 # wait for dokku cleanup to happen in the background

  run /bin/bash -c "docker inspect $RANDOM_RUN_CID"
  echo "output: $output"
@@ -45,7 +45,7 @@ teardown() {

@test "(core) port exposure (dockerfile raw port)" {
  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-  cat<<EOF > $DOCKERFILE
+  cat <<EOF >$DOCKERFILE
 EXPOSE 3001/udp
 EXPOSE 3003
 EXPOSE  3000/tcp
@@ -58,7 +58,7 @@ EOF

@test "(core) port exposure (dockerfile tcp port)" {
  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-  cat<<EOF > $DOCKERFILE
+  cat <<EOF >$DOCKERFILE
 EXPOSE 3001/udp
 EXPOSE  3000/tcp
 EXPOSE 3003
@@ -84,7 +84,7 @@ EOF
@test "(core) image type detection (herokuish custom user)" {
  export DOKKU_ROOT
  deploy_app
-  CID=$(< "$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1")
+  CID=$(<"$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1")
  docker commit --change "ENV USER postgres" "$CID" "dokku/${TEST_APP}:latest"
  dokku config:set --no-restart "$TEST_APP" DOKKU_APP_USER=postgres
  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
--- a/tests/unit/cron.bats
+++ b/tests/unit/cron.bats
@@ -118,7 +118,7 @@ teardown() {
 }

@test "(cron) injected entries" {
-  echo "echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
  chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries

  run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -133,7 +133,7 @@ teardown() {
  assert_output_contains "@daily /bin/true"

  # log file
-  echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
  chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries

  run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -141,7 +141,6 @@ teardown() {
  echo "status: $status"
  assert_success

-
  run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
  echo "output: $output"
  echo "status: $status"
@@ -149,7 +148,7 @@ teardown() {
  assert_output_contains "@daily /bin/true &>> /var/log/dokku/log.log"

  # specify matching scheduler
-  echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
  chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries

  run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -157,7 +156,6 @@ teardown() {
  echo "status: $status"
  assert_success

-
  run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
  echo "output: $output"
  echo "status: $status"
@@ -165,7 +163,7 @@ teardown() {
  assert_output_contains "@daily /bin/true"

  # specify non-matching scheduler
-  echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
  chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries

  run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -173,7 +171,6 @@ teardown() {
  echo "status: $status"
  assert_success

-
  run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
  echo "output: $output"
  echo "status: $status"
--- a/tests/unit/docker-options.bats
+++ b/tests/unit/docker-options.bats
@@ -283,7 +283,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
  run /bin/bash -c "docker inspect -f '{{ .Config.Volumes }}' $CID | sed -e 's:map::g' | tr -d '[]' | tr ' ' $'\n' | sort | xargs"
  echo "output: $output"
  echo "status: $status"
@@ -325,7 +325,7 @@ teardown() {
  assert_success
  assert_output_contains "One or more build-args \[PAYPAL_CLIENT_ID PAYPAL_CLIENT_MODE\] were not consumed"

-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
  run /bin/bash -c "docker inspect -f '{{ .Config.Volumes }}' $CID | sed -e 's:map::g' | tr -d '[]' | tr ' ' $'\n' | sort | xargs"
  echo "output: $output"
  echo "status: $status"
--- a/tests/unit/git_3.bats
+++ b/tests/unit/git_3.bats
@@ -303,7 +303,6 @@ teardown() {
  assert_output_contains "Application deployed"
 }

-
@test "(git) git:sync private" {
  if [[ -z "$SYNC_GITHUB_USERNAME" ]] || [[ -z "$SYNC_GITHUB_PASSWORD" ]]; then
    skip "skipping due to missing github credentials SYNC_GITHUB_USERNAME:SYNC_GITHUB_PASSWORD"
--- a/tests/unit/network.bats
+++ b/tests/unit/network.bats
@@ -47,7 +47,7 @@ teardown() {
  assert_http_success "${TEST_APP}.dokku.me"

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE)
+    assert_external_port $(<$CID_FILE)
  done

  run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces false"
@@ -62,7 +62,7 @@ teardown() {
  assert_http_success "${TEST_APP}.dokku.me"

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_not_external_port $(< $CID_FILE)
+    assert_not_external_port $(<$CID_FILE)
  done
 }

@@ -77,7 +77,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
  echo "output: $output"
  echo "status: $status"
  assert_success
--- a/tests/unit/nginx-vhosts_1.bats
+++ b/tests/unit/nginx-vhosts_1.bats
@@ -32,7 +32,7 @@ teardown() {
  deploy_app
  dokku domains:disable $TEST_APP

-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
  check_urls http://${HOSTNAME}:[0-9]+

  URLS=$(dokku --quiet urls "$TEST_APP")
@@ -60,7 +60,7 @@ teardown() {
 }

@test "(nginx-vhosts) nginx:build-config (with global VHOST)" {
-  echo "dokku.me" > "$DOKKU_ROOT/VHOST"
+  echo "dokku.me" >"$DOKKU_ROOT/VHOST"
  deploy_app

  check_urls http://${TEST_APP}.dokku.me
--- a/tests/unit/nginx-vhosts_10.bats
+++ b/tests/unit/nginx-vhosts_10.bats
@@ -171,4 +171,3 @@ teardown() {
  echo "status: $status"
  assert_output_contains "X-Forwarded-Ssl" 0
 }
-
--- a/tests/unit/nginx-vhosts_4.bats
+++ b/tests/unit/nginx-vhosts_4.bats
@@ -34,10 +34,10 @@ teardown() {

@test "(nginx-vhosts) nginx:build-config (without global VHOST and IPv4 address set as HOSTNAME)" {
  rm "$DOKKU_ROOT/VHOST"
-  echo "127.0.0.1" > "$DOKKU_ROOT/VHOST"
+  echo "127.0.0.1" >"$DOKKU_ROOT/VHOST"
  deploy_app

-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
  check_urls http://${HOSTNAME}:[0-9]+

  URLS=$(dokku --quiet urls "$TEST_APP")
@@ -48,10 +48,10 @@ teardown() {

@test "(nginx-vhosts) nginx:build-config (without global VHOST and IPv6 address set as HOSTNAME)" {
  rm "$DOKKU_ROOT/VHOST"
-  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" > "$DOKKU_ROOT/VHOST"
+  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" >"$DOKKU_ROOT/VHOST"
  deploy_app

-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
  check_urls http://${HOSTNAME}:[0-9]+
 }

--- a/tests/unit/nginx-vhosts_5.bats
+++ b/tests/unit/nginx-vhosts_5.bats
@@ -16,7 +16,7 @@ teardown() {
 }

@test "(nginx-vhosts) nginx:build-config (sslip.io style hostnames)" {
-  echo "127.0.0.1.sslip.io.dokku.me" > "$DOKKU_ROOT/VHOST"
+  echo "127.0.0.1.sslip.io.dokku.me" >"$DOKKU_ROOT/VHOST"
  deploy_app

  check_urls http://${TEST_APP}.127.0.0.1.sslip.io.dokku.me
--- a/tests/unit/nginx-vhosts_6.bats
+++ b/tests/unit/nginx-vhosts_6.bats
@@ -216,7 +216,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  echo "invalid config" > "/home/dokku/${TEST_APP}/nginx.conf"
+  echo "invalid config" >"/home/dokku/${TEST_APP}/nginx.conf"

  run /bin/bash -c "dokku nginx:validate-config"
  echo "output: $output"
@@ -238,7 +238,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  echo "invalid config" > "/home/dokku/${TEST_APP}/nginx.conf"
+  echo "invalid config" >"/home/dokku/${TEST_APP}/nginx.conf"

  run /bin/bash -c "dokku nginx:validate-config $TEST_APP --clean"
  echo "output: $output"
--- a/Show More
+++ b/Show More