Release 0.25.5

# History

## 0.25.5

Install/update via the bootstrap script:

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

### Bug Fixes

- #4787: @josegonzalez Do not require double quotes when issuing dokku run commands
- #4816: @josegonzalez Set the DOKKU_HOST_ROOT on docker container start
- #4810: @josegonzalez Handle udp ports when fetching network config
- #4812: @josegonzalez Silence stderr when fetching a command from the Procfile
- #4800: @josegonzalez Add help2man os package for copyfiles make target to devcontainer
- #4796: @josegonzalez Remove the --restart flag from pre-deploy chown containers

### New Features

- #4809: @josegonzalez Implement storage:ensure-directory command
- #4801: @josegonzalez Expose git-from-archive and git-from-image plugin triggers
- #4785: @josegonzalez Add support for VSCode Dev Containers

### Documentation

- #4819: @stephenheron Fixed typo in tar documentation
- #4824: @dy3l Fix GitLab case
- #4822: @josegonzalez Add a note about using the registry:login command for private image deployments
- #4808: @francipvb Added a comment about Dockerfile deployment
- #4807: @FinnWoelm Docs: Fix instructions for enabling Docker Buildkit
- #4786: @josegonzalez Add missing argument from trigger documentation
- #4780: @adam12 Update source for `dokku-update`

### Tests

- #4828: @josegonzalez Update golang in test apps to latest version
- #4815: @josegonzalez tests: use python3 shebang for shellcheck-to-junit script
- #4814: @josegonzalez Add wget to devcontainer to fix shfmt installation
- #4791: @josegonzalez Fix test running in devcontainer

### Other

- #4813: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 197 to 198 in /tests/apps/php
- #4802: @dependabot[bot] chore(deps): bump django from 3.1.12 to 3.1.13 in /tests/apps/dockerfile-release
- #4784: @josegonzalez Upgrade vector image to 0.16.x

.devcontainer/Dockerfile

@@ -0,0 +1,19 @@
+FROM dokku/dokku:latest
+
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y build-essential file nano && \
+  apt-get install --no-install-recommends -y help2man shellcheck uuid-runtime wget xmlstarlet && \
+  apt-get clean autoclean && \
+  apt-get autoremove --yes && \
+  rm -rf /var/lib/apt/lists/*
+
+ADD https://raw.githubusercontent.com/dokku/dokku/master/tests/dhparam.pem /mnt/dokku/etc/nginx/dhparam.pem
+
+COPY .devcontainer/bin/ /usr/local/bin/
+COPY ["tests.mk", "Makefile"]
+RUN make ci-dependencies
+
+COPY . .
+
+ENV DOKKU_HOSTNAME=dokku.me
+LABEL org.label-schema.schema-version=1.0 org.label-schema.vendor=dokku com.dokku.devcontainer=true

.devcontainer/bin/copy-plugin

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+main() {
+  declare PLUGIN_NAME="$1"
+
+  make go-build-plugin copyplugin PLUGIN_NAME=$PLUGIN_NAME
+}
+
+main "$@"

.devcontainer/devcontainer.json

@@ -0,0 +1,18 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "containerEnv": {
+    "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data/home/dokku",
+    "GO_ROOT_MOUNT": "${localWorkspaceFolder}:/go/src/github.com/dokku/dokku"
+  },
+  "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"],
+  "runArgs": ["--init"]
+}

HISTORY.md

@@ -1,5 +1,100 @@
 # History
 
+## 0.25.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.25.5/bootstrap.sh
+sudo DOKKU_TAG=v0.25.5 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4787: @josegonzalez Do not require double quotes when issuing dokku run commands
+- #4816: @josegonzalez Set the DOKKU_HOST_ROOT on docker container start
+- #4810: @josegonzalez Handle udp ports when fetching network config
+- #4812: @josegonzalez Silence stderr when fetching a command from the Procfile
+- #4800: @josegonzalez Add help2man os package for copyfiles make target to devcontainer
+- #4796: @josegonzalez Remove the --restart flag from pre-deploy chown containers
+
+### New Features
+
+- #4809: @josegonzalez Implement storage:ensure-directory command
+- #4801: @josegonzalez Expose git-from-archive and git-from-image plugin triggers
+- #4785: @josegonzalez Add support for VSCode Dev Containers
+
+### Documentation
+
+- #4819: @stephenheron Fixed typo in tar documentation
+- #4824: @dy3l Fix GitLab case
+- #4822: @josegonzalez Add a note about using the registry:login command for private image deployments
+- #4808: @francipvb Added a comment about Dockerfile deployment
+- #4807: @FinnWoelm Docs: Fix instructions for enabling Docker Buildkit
+- #4786: @josegonzalez Add missing argument from trigger documentation
+- #4780: @adam12 Update source for `dokku-update`
+
+### Tests
+
+- #4828: @josegonzalez Update golang in test apps to latest version
+- #4815: @josegonzalez tests: use python3 shebang for shellcheck-to-junit script
+- #4814: @josegonzalez Add wget to devcontainer to fix shfmt installation
+- #4791: @josegonzalez Fix test running in devcontainer
+
+### Other
+
+- #4813: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 197 to 198 in /tests/apps/php
+- #4802: @dependabot[bot] chore(deps): bump django from 3.1.12 to 3.1.13 in /tests/apps/dockerfile-release
+- #4784: @josegonzalez Upgrade vector image to 0.16.x
+
+## 0.25.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.25.4/bootstrap.sh
+sudo DOKKU_TAG=v0.25.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4775: @josegonzalez Add support for url-encoded vector-sink config values …
+- #4777: @josegonzalez Set correct version for registry plugin
+
+### Documentation
+
+- #4776: @josegonzalez Clarify valid values for container-type when entering containers
+
+### Other
+
+- #4774: @dependabot[bot] chore(deps): bump sqlparse from 0.4.1 to 0.4.2 in /tests/apps/dockerfile-release
+
+## 0.25.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.25.3/bootstrap.sh
+sudo DOKKU_TAG=v0.25.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4767: @josegonzalez Output logs when container rename fails and continue on
+- #4764: @josegonzalez Reference correct plugin when setting up app-json plugin
+
+### Refactors
+
+- #4741: @josegonzalez Use a Dockerfile to speed up env var injection for herokuish app builds
+
+### Documentation
+
+- #4763: @josegonzalez Remove install doc references to removed web installer
+
+### Other
+
+- #4766: @josegonzalez Capitalize certain log messages for aesthetic reasons
+
 ## 0.25.2
 
 Install/update via the bootstrap script:

README.md

@@ -98,11 +98,11 @@ 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.25.2/bootstrap.sh
-sudo DOKKU_TAG=v0.25.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.25.5/bootstrap.sh
+sudo DOKKU_TAG=v0.25.5 bash bootstrap.sh
 ```
 
-You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
+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.
 
 If you wish for a more unattended installation method, see [these](https://dokku.com/docs/getting-started/install/debian/#unattended-installation) docs.
 

common.mk

@@ -4,6 +4,7 @@ GO_REPO_ROOT := /go/src/github.com/dokku/dokku
 BUILD_IMAGE := golang:1.15.6
 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
 GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
+GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT)
 
 .PHONY: build-in-docker build clean src-clean
 
@@ -12,7 +13,7 @@ build: $(BUILD)
 build-in-docker: clean
 	mkdir -p /tmp/dokku-go-build-cache
 	docker run --rm \
-		-v $$PWD/../..:$(GO_REPO_ROOT) \
+		-v $(GO_ROOT_MOUNT) \
 		-v $(GO_BUILD_CACHE):/root/.cache \
 		-v $(GO_MOD_CACHE):/go/pkg/mod \
 		-e PLUGIN_NAME=$(PLUGIN_NAME) \

debian/control

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

docker/etc/my_init.d/10_dokku_init

@@ -62,6 +62,12 @@ main() {
     echo "export DOCKER_BIN=/usr/local/bin/docker" >"/home/dokku/.dokkurc/DOCKER_BIN"
   fi
 
+  if [[ -n "$DOKKU_HOST_ROOT" ]]; then
+    touch /etc/default/dokku
+    echo "export DOKKU_HOST_ROOT=$DOKKU_HOST_ROOT" >>/etc/default/dokku
+    chown dokku:dokku /etc/default/dokku
+  fi
+
   NGINX_ROOT="/etc/nginx"
   if [[ -x /usr/bin/openresty ]]; then
     NGINX_ROOT="/usr/local/openresty/nginx/conf"

docs/advanced-usage/persistent-storage.md

@@ -5,10 +5,11 @@
 The preferred method to mount external containers to a Dokku managed container, is to use the Dokku storage plugin.
 
 ```
-storage:list <app>                             # List bind mounts for app's container(s) (host:container)
-storage:mount <app> <host-dir:container-dir>   # Create a new bind mount
-storage:report [<app>] [<flag>]                # Displays a checks report for one or more apps
-storage:unmount <app> <host-dir:container-dir> # Remove an existing bind mount
+storage:ensure-directory [--chown option] <directory>  # Creates a persistent storage directory in the recommended storage path
+storage:list <app>                                     # List bind mounts for app's container(s) (host:container)
+storage:mount <app> <host-dir:container-dir>           # Create a new bind mount
+storage:report [<app>] [<flag>]                        # Displays a checks report for one or more apps
+storage:unmount <app> <host-dir:container-dir>         # Remove an existing bind mount
 ```
 
 > The storage plugin is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy/run phase.
@@ -20,50 +21,77 @@ The storage plugin supports the following mount points:
 
 ## Usage
 
-This example demonstrates how to mount the recommended directory to `/storage` inside an application called `node-js-app`. For simplicity, the Dokku project recommends using the directory `/var/lib/dokku/data/storage` directory as the root host path for mounts. This directory is created on Dokku installation.
+### Creating storage directories
+
+> 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.
 
 ```shell
-# we use a subdirectory inside of the host directory to scope it to just the app
-dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/storage
+dokku storage:ensure-directory lollipop
 ```
 
-Dokku will then mount the shared contents of `/var/lib/dokku/data/storage/node-js-app` to `/storage` inside the container. Mounts are only available for containers crated via `run` and by the deploy process, and not during the build process. In addition, the host path is never auto-created by either Dokku or Docker, and should be an explicit path, not one relative to the current working directory.
+```
+-----> Ensuring /var/lib/dokku/data/storage/lollipop exists
+       Setting directory ownership to 32767:32767
+       Directory ready for mounting
+```
 
-> If the `/storage` path within the container had pre-existing content, the container files will be overrwritten. This may be an issue for users that create assets at build time but then mount a directory at the same place during runtime. Files are not merged.
+By default, permissions are set for usage with Herokuish buildpacks. These permissions can be changed via the `--chown` option according to the following table:
 
-Once you have mounted persistent storage, you will also need to restart the application. See the
-[process scaling documentation](/docs/processes/process-management.md) for more information.
+- `--chown herokuish` (default): Use `32767:32767` as the folder permissions.
+  - This is used for apps deployed with Buildpacks via Herokuish.
+- `--chown heroku`: Use `1000:1000` as the folder permissions.
+  - This is used for apps deployed with Cloud Native Buildpacks using the `heroku/buildpacks` builder.
+- `--chown packeto`: Use `2000:2000` as the folder permissions.
+  - This is used for apps deployed with Cloud Native Buildpacks using the `cloudfoundry/cnb` or `packeto` builders.
+- `--chown false`: Skips the `chown` call.
+
+Users deploying via Dockerfile will want to specify `--chown false` and manually `chown` the created directory if the user and/or group id  of the runnning process in the deployed container do not correspond to any of the above options.
+
+> Warning: Failing to set the correct directory ownership may result in issues in persisting files written to the mounted storage directory.
+
+### Mounting storage into apps
+
+Dokku supports mounting both explicit host paths as well as docker volumes via the `storage:mount` command. This takes two arguments, an app name and a `host-path:container-path` or `docker-volume:container-path` combination.
+
+```shell
+# mount the directory into your container's /app/storage directory, relative to the container root (/)
+# explicit host paths _must_ exist prior to usage.
+dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/app/storage
+
+# mount the docker volume into your container's /app/storage directory, relative to the container root (/)
+# docker volumes _must_ exist prior to usage.
+dokku storage:mount node-js-app some-docker-volume:/app/storage
+```
+
+In the first example, Dokku will then mount the shared contents of `/var/lib/dokku/data/storage/node-js-app` to `/app/storage` inside the container.  The mount point is *not* relative to your app's working directory, and is instead relative to the root (`/`) of the container. Mounts are only available for containers created via `run` and by the deploy process, and not during the build process. In addition, the host path is never auto-created by either Dokku or Docker, and should be an explicit path, not one relative to the current working directory.
+
+> If the `/storage` path within the container had pre-existing content, the container files will be over-written. This may be an issue for users that create assets at build time but then mount a directory at the same place during runtime. Files are not merged.
+
+Once persistent storage is mounted, the app requires a restart. See the [process scaling documentation](/docs/processes/process-management.md) for more information.
 
 ```shell
 dokku ps:restart app-name
 ```
 
-A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root (`/`) of the container.
+### Unmounting storage
+
+If an app no longer requires a mounted volume or directory, the `storage:unmount` command can be called. This takes the same arguments as the `storage:mount` command, an app name and a `host-path:container-path` or `docker-volume:container-path` combination.
 
 ```shell
-# creating storage for the app 'node-js-app'
-mkdir -p  /var/lib/dokku/data/storage/node-js-app
+# unmount the directory from your container's /app/storage directory, relative to the container root (/)
+dokku storage:unmount node-js-app /var/lib/dokku/data/storage/node-js-app:/app/storage
 
-# set the directory ownership. Below is an example for herokuish
-# but see the `Directory Permissions` section for more details
-chown -R 32767:32767 /var/lib/dokku/data/storage/node-js-app
-
-# mount the directory into your container's /app/storage directory, relative to root
-dokku storage:mount app-name /var/lib/dokku/data/storage/node-js-app:/app/storage
+# unmount the docker volume from your container's /app/storage directory, relative to the container root (/)
+dokku storage:unmount node-js-app some-docker-volume:/app/storage
 ```
 
-You can mount one or more directories as desired by following the above pattern.
+Once persistent storage is unmounted, the app requires a restart. See the [process scaling documentation](/docs/processes/process-management.md) for more information.
 
-### Directory Permissions
-
-The host directory should always be owned by the container user and group id. If this is not the case, files may not persist when written to mounted storage.
-
-- Buildpacks via Herokuish: Use `32767:32767` as the file permissions
-- For Cloud Native Buildpacks: This will depend on the builder in question, but can be retrieved via the `CNB_USER_ID` and `CNB_GROUP_ID` environment variables on the builder image. Common builders are as follows:
-  - heroku/buildpacks: `1000:1000`
-  - cloudfoundry/cnb: `2000:2000`
-  - packeto: `2000:2000`
-- Dockerfile and Docker Image: Use the user and group id which corresponds to the one running the process within the container.
+```shell
+dokku ps:restart app-name
+```
 
 ### Displaying storage reports for an app
 
@@ -113,7 +141,7 @@ dokku storage:report node-js-app --storage-deploy-mounts
 
 ### Sharing storage across deploys
 
-Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web applications, like user uploads or large binary assets like images, a directory outside the container should be mounted.
+Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web apps, like user uploads or large binary assets like images, a directory outside the container should be mounted.
 
 ### Shared storage between containers
 
@@ -139,11 +167,11 @@ You cannot use mounted volumes during the build phase of a Dockerfile deploy. Th
 
 > Note: **This can cause data loss** if you bind a mount under `/app` in buildpack apps as herokuish will attempt to remove the original app path during the build phase.
 
-## Application User and Persistent Storage file ownership (buildpack apps only)
+## App User and Persistent Storage file ownership (buildpack apps only)
 
 > New as of 0.7.1
 
-By default, Dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
+By default, Dokku will execute your buildpack app processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
 
 > NOTE: this user must exist in your herokuish image.
 

docs/advanced-usage/plugin-management.md

@@ -35,35 +35,35 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.25.2 enabled    dokku core standard plugin
-  20_events            0.25.2 enabled    dokku core events logging plugin
-  app-json             0.25.2 enabled    dokku core app-json plugin
-  apps                 0.25.2 enabled    dokku core apps plugin
-  build-env            0.25.2 enabled    dokku core build-env plugin
-  buildpacks           0.25.2 enabled    dokku core buildpacks plugin
-  certs                0.25.2 enabled    dokku core certificate management plugin
-  checks               0.25.2 enabled    dokku core checks plugin
-  common               0.25.2 enabled    dokku core common plugin
-  config               0.25.2 enabled    dokku core config plugin
-  docker-options       0.25.2 enabled    dokku core docker-options plugin
-  domains              0.25.2 enabled    dokku core domains plugin
-  enter                0.25.2 enabled    dokku core enter plugin
-  git                  0.25.2 enabled    dokku core git plugin
-  logs                 0.25.2 enabled    dokku core logs plugin
-  network              0.25.2 enabled    dokku core network plugin
-  nginx-vhosts         0.25.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.25.2 enabled    dokku core plugin plugin
-  proxy                0.25.2 enabled    dokku core proxy plugin
-  ps                   0.25.2 enabled    dokku core ps plugin
-  repo                 0.25.2 enabled    dokku core repo plugin
-  resource             0.25.2 enabled    dokku core resource plugin
-  scheduler-docker-local 0.25.2 enabled    dokku core scheduler-docker-local plugin
-  shell                0.25.2 enabled    dokku core shell plugin
-  ssh-keys             0.25.2 enabled    dokku core ssh-keys plugin
-  storage              0.25.2 enabled    dokku core storage plugin
-  tags                 0.25.2 enabled    dokku core tags plugin
-  tar                  0.25.2 enabled    dokku core tar plugin
-  trace                0.25.2 enabled    dokku core trace plugin
+  00_dokku-standard    0.25.5 enabled    dokku core standard plugin
+  20_events            0.25.5 enabled    dokku core events logging plugin
+  app-json             0.25.5 enabled    dokku core app-json plugin
+  apps                 0.25.5 enabled    dokku core apps plugin
+  build-env            0.25.5 enabled    dokku core build-env plugin
+  buildpacks           0.25.5 enabled    dokku core buildpacks plugin
+  certs                0.25.5 enabled    dokku core certificate management plugin
+  checks               0.25.5 enabled    dokku core checks plugin
+  common               0.25.5 enabled    dokku core common plugin
+  config               0.25.5 enabled    dokku core config plugin
+  docker-options       0.25.5 enabled    dokku core docker-options plugin
+  domains              0.25.5 enabled    dokku core domains plugin
+  enter                0.25.5 enabled    dokku core enter plugin
+  git                  0.25.5 enabled    dokku core git plugin
+  logs                 0.25.5 enabled    dokku core logs plugin
+  network              0.25.5 enabled    dokku core network plugin
+  nginx-vhosts         0.25.5 enabled    dokku core nginx-vhosts plugin
+  plugin               0.25.5 enabled    dokku core plugin plugin
+  proxy                0.25.5 enabled    dokku core proxy plugin
+  ps                   0.25.5 enabled    dokku core ps plugin
+  repo                 0.25.5 enabled    dokku core repo plugin
+  resource             0.25.5 enabled    dokku core resource plugin
+  scheduler-docker-local 0.25.5 enabled    dokku core scheduler-docker-local plugin
+  shell                0.25.5 enabled    dokku core shell plugin
+  ssh-keys             0.25.5 enabled    dokku core ssh-keys plugin
+  storage              0.25.5 enabled    dokku core storage plugin
+  tags                 0.25.5 enabled    dokku core tags plugin
+  tar                  0.25.5 enabled    dokku core tar plugin
+  trace                0.25.5 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/assets/favicons/browserconfig.xml

@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/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.25.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.25.5\/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.25.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }

docs/assets/versions.json

@@ -22,6 +22,6 @@
     "0.22.9",
     "0.23.9",
     "0.24.10",
-    "0.25.2"
+    "0.25.5"
   ]
 }

docs/deployment/builders/dockerfiles.md

@@ -148,12 +148,8 @@ RUN echo $NODE_ENV
 If your Dockerfile is using Docker engine's [buildkit](https://docs.docker.com/develop/develop-images/build_enhancements/) (not to be confused with buildpacks), then the `DOCKER_BUILDKIT=1` environment variable needs to be set. Additionally, complete build log output can be forced via `BUILDKIT_PROGRESS=plain`. Both of these environment variables can be set as follows:
 
 ```shell
-# via config:set
-dokku config:set --global DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain
-
-# on the /etc/default/dokku file
-echo DOCKER_BUILDKIT=1 | sudo tee -a /etc/default/dokku
-echo BUILDKIT_PROGRESS=plain | sudo tee -a /etc/default/dokku
+echo "export DOCKER_BUILDKIT=1" | sudo tee -a /etc/default/dokku
+echo "export BUILDKIT_PROGRESS=plain" | sudo tee -a /etc/default/dokku
 ```
 
 #### Buildkit directory caching

docs/deployment/logs.md

@@ -37,7 +37,7 @@ You can use these modifiers as follows:
 dokku logs node-js-app -t -p web
 ```
 
-will show logs continually from the web process.
+The above command will show logs continually from the web process.
 
 ### Failed deploy logs
 
@@ -127,6 +127,29 @@ dokku logs:vector-stop
 
 The `vector` container will be stopped and removed from the system. If the container is not running, this command will do nothing.
 
+#### Checking Vector's Logs
+
+It may be necessary to check the vector container's logs to ensure that vector is operating as expected. This can be performed with the `logs:vector-logs` command.
+
+```shell
+dokku logs:vector-logs
+```
+
+This command also supports the following modifiers:
+
+```shell
+--num NUM        # the number of lines to display
+--tail           # continually stream logs
+```
+
+You can use these modifiers as follows:
+
+```shell
+dokku logs:vector-logs --tail --num 10
+```
+
+The above command will show logs continually from the vector container, with an initial history of 10 log lines
+
 #### Configuring a log sink
 
 Vector uses the concept of log "sinks" to send logs to a given endpoint. Log sinks may be configured globally or on a per-app basis by specifying a `vector-sink` in DSN form with the `logs:set` command. Specifying a sink value will reload any running vector container.
@@ -174,4 +197,13 @@ Valid values for `SINK_TYPE` include all log vector log sinks, while `SINK_OPTIO
 - `[int]`: form: `key[]=int`
 - `table`: form: `option[key]=value`
 
+For some sinks - such as the `http` sink - it may be useful to use special characters such as `&`. These characters must be url escaped as per [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986.html).
+
+```shell
+# the following command will set the `http` sink with a uri config value
+# for a uri config value: https://loggerservice.com:1234/?token=abc1234&type=vector
+# the url quoted version: https%3A//loggerservice.com%3A1234/%3Ftoken%3Dabc1234%26type%3Dvector
+dokku logs:set test vector-sink "http://?uri=https%3A//loggerservice.com%3A1234/%3Ftoken%3Dabc1234%26type%3Dvector"
+```
+
 Please read the [sink documentation](https://vector.dev/docs/reference/sinks/) for your sink of choice to configure the sink as desired.

docs/deployment/methods/git.md

@@ -143,6 +143,8 @@ The `git:from-image` command can optionally take a git `user.name` and `user.ema
 dokku git:from-image node-js-app dokku/node-js-getting-started:latest "Camila" "camila@example.com"
 ```
 
+If the image is a private image that requires a docker login to access, the `registry:login` command should be used to log into the registry. See the [registry documentation](/docs/advanced-usage/registry-management.md#logging-into-a-registry) for more details on this process.
+
 Finally, certain images may require a custom build context in order for `ONBUILD ADD` and `ONBUILD COPY` statements to succeed. A custom build context can be specified via the `--build-dir` flag. All files in the specified `build-dir` will be copied into the repository for use within the `docker build` process. The build context _must_ be specified on each deploy, and is not otherwise persisted between builds.
 
 ```shell

docs/deployment/methods/tar.md

@@ -1,6 +1,6 @@
 # Tarball Deployment
 
-> Warning: As of 0.24.0, this functionality is deprecated in favor of the [`git:from-archive`](/docs/deployment/methods/git.md#initializing-an-app-repository-from-an-archive-file) command. It will be removed in a future release, and is considered unmaintained. Users are highly encouraged to switch their workflows to `git:from-arhive`.
+> Warning: As of 0.24.0, this functionality is deprecated in favor of the [`git:from-archive`](/docs/deployment/methods/git.md#initializing-an-app-repository-from-an-archive-file) command. It will be removed in a future release, and is considered unmaintained. Users are highly encouraged to switch their workflows to `git:from-archive`.
 >
 > New as of 0.4.0
 

docs/development/plugin-triggers.md

@@ -723,6 +723,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `git-from-archive`
+
+- Description: Updates an app's git repository from an archive and then triggers a build
+- Invoked by: `git:from-archive`
+- Arguments: `$APP $ARCHIVE_URL $ARCHIVE_TYPE $USER_NAME $USER_EMAIL`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `git-from-directory`
 
 - Description: Updates an app's git repository from a source directory and then triggers a build
@@ -738,6 +753,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `git-from-image`
+
+- Description: Updates an app's git repository from a docker image and then triggers a build as necessary
+- Invoked by: `git:from-image`
+- Arguments: `$APP $DOCKER_IMAGE $BUILD_DIR $USER_NAME $USER_EMAIL`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `git-post-pull`
 
 - Description:
@@ -1674,7 +1704,7 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 
 - Description: Allows you to run commands before all containers are restored
 - Invoked by: `dokku ps:restore`
-- Arguments: `$DOKKU_SCHEDULER`
+- Arguments: `$DOKKU_SCHEDULER $APP`
 - Example:
 
 ```shell

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.25.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.25.5-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'

docs/getting-started/install/docker.md

@@ -3,7 +3,7 @@
 Pull the dokku/dokku image:
 
 ```shell
-docker pull dokku/dokku:0.25.2
+docker pull dokku/dokku:0.25.5
 ```
 
 Next, run the image.
@@ -11,13 +11,14 @@ Next, run the image.
 ```shell
 docker container run \
   --env DOKKU_HOSTNAME=dokku.me \
+  --env DOKKU_HOST_ROOT=/var/lib/dokku/home/dokku \
   --name dokku \
   --publish 3022:22 \
   --publish 8080:80 \
   --publish 8443:443 \
   --volume /var/lib/dokku:/mnt/dokku \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  dokku/dokku:0.25.2
+  dokku/dokku:0.25.5
 ```
 
 Dokku is run in the following configuration:
@@ -28,7 +29,8 @@ Dokku is run in the following configuration:
 - Container HTTP port 80 is exposed on the host as 8080.
 - Container HTTPS port 443 is exposed on the host as 8443.
 - Data within the container is stored on the host within the `/var/lib/dokku` directory.
-- The docker socket is mounted into container
+- Image build cache is set to the data dir + `/home/dokku`.
+- The docker socket is mounted into container.
 
 Application repositories, plugin config, as well as plugin data are persisted to disk within the specified host directory for `/var/lib/dokku`.
 

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

docs/getting-started/troubleshooting.md

@@ -64,6 +64,25 @@ Save the file and try stopping nginx and starting it again:
 ## * Starting nginx nginx                                        [ OK ]
 ```
 
+---
+
+Using the `EXPOSE` directive in a Dockerfile may be another reason why you might see the default site. When the `EXPOSE` directive is in use and a proxy plugin is enabled (the default), the proxy plugin will listen to requests on the ports specified in the `EXPOSE` stanza.
+
+For example, if you have an `EXPOSE` directive like so:
+
+```Dockerfile
+EXPOSE 8000
+```
+
+The proxy port mapping will be `http:8000:8000`.
+
+To avoid this issue, either of the following can be done:
+
+- Remove `EXPOSE` directive: This will require respecting the `$PORT` environment variable (automatically set by Dokku). Once that change is deployed, the port mapping should be cleared via the `dokku proxy:ports-clear $APP` command (where `$APP` is your app name).
+- Update the port mapping: Updating the port mapping to redirect port `80` to your app's exposed port via `dokku proxy:ports-set $APP http:80:$EXPOSED_PORT` can also fix the issue. This will also allow certificate management and the letsencrypt plugin to work correctly.
+
+See the [port management documentation](/docs/networking/port-management.md) for more information on how Dokku exposes ports for applications and how you can configure these for your app.
+
 ### I want to deploy my app, but while pushing I get the following error
 
 The following error may be emitted from a deploy:

docs/getting-started/upgrading.md

@@ -87,7 +87,8 @@ We provide a helpful binary called `dokku-update`. This is a recommended package
 - Automates many of the upgrade instructions for you.
 - Provides a clean way for us to further enhance the upgrade process in the future.
 
-When installing from source, this is available from `contrib/dokku-update`, and is also available on Debian and RPM-based systems from our package repositories under the name `dokku-update`.
+This binary is available on Debian and RPM-based systems from our package repositories under the name `dokku-update`. When installing from source,
+this is available from a separate Github repository at [dokku/dokku-update](https://github.com/dokku/dokku-update).
 
 ## Upgrading using `apt`
 

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.25.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.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.25.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.25.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.25.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.25.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.25.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.25.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.25.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
     </style>
@@ -95,15 +95,18 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.25.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.25.5/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.25.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.25.5 bash bootstrap.sh</span>
           </p>
           <p class="line">
-            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
+            <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# and user access (via `dokku ssh-keys:add`) to complete the installation</span>
           </p>
         </div>
 
@@ -163,7 +166,10 @@
             <span class="command">dokku plugin:install-dependencies --core <span class="output"># run with root!</span></span>
           </p>
           <p class="line">
-            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
+            <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# and user access (via `dokku ssh-keys:add`) to complete the installation</span>
           </p>
         </div>
 

docs/processes/entering-containers.md

@@ -11,14 +11,26 @@ enter <app>  [<container-type> || --container-id <container-id>]  # Connect to a
 The `enter` command can be used to enter a running container. The following variations of the command exist:
 
 ```shell
+# enter the web process
 dokku enter node-js-app web
+
+# enter the first web process
 dokku enter node-js-app web.1
+
+# enter a process for an app by container ID
 dokku enter node-js-app --container-id ID
 ```
 
+The `container-type` argument can be one either:
+
+- If your app has a `Procfile`, the name of a process type in your `Procfile`.
+- If your app has no `Procfile`, the word `web`.
+
+If the specified process type is scaled up to more than one container, then the first container will be automatically selected. this can be overriden by specifying an integer index denoting the desired container, where the first container's index is `1`.
+
 Additionally, the `enter` command can be executed with no `<container-type>`. If only a single `<container-type>` is defined in the app's Procfile, executing `enter` will drop the terminal into the only running container. This behavior is not supported when specifying a custom command; as described below.
 
-By default, it runs a `/bin/bash`, but can also be used to run a custom command:
+By default, `dokku enter` will run a `/bin/bash`, but can also be used to run custom commands:
 
 ```shell
 # just echo hi

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.25.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.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.25.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.25.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.25.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.25.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.25.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.25.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.25.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.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.25.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -42,7 +42,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.25.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
@@ -171,7 +171,7 @@
 
             <a href="#" class="list-group-item disabled">Continuous Integration</a>
             <a href="/{{NAME}}/deployment/continuous-integration/github-actions/" class="list-group-item">GitHub Actions</a>
-            <a href="/{{NAME}}/deployment/continuous-integration/gitlab-ci/" class="list-group-item">Gitlab CI</a>
+            <a href="/{{NAME}}/deployment/continuous-integration/gitlab-ci/" class="list-group-item">GitLab CI</a>
             <a href="/{{NAME}}/deployment/continuous-integration/generic/" class="list-group-item">Generic</a>
 
             <a href="#" class="list-group-item disabled">Community Contributions</a>

plugins/00_dokku-standard/plugin.toml

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

plugins/20_events/git-from-archive

@@ -0,0 +1 @@
+hook

plugins/20_events/git-from-directory

@@ -0,0 +1 @@
+hook

plugins/20_events/git-from-image

@@ -0,0 +1 @@
+hook

plugins/20_events/plugin.toml

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

plugins/app-json/plugin.toml

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

plugins/app-json/triggers.go

@@ -10,8 +10,8 @@ import (
 
 // TriggerInstall initializes app restart policies
 func TriggerInstall() error {
-	if err := common.PropertySetup("common"); err != nil {
-		return fmt.Errorf("Unable to install the common plugin: %s", err.Error())
+	if err := common.PropertySetup("app-json"); err != nil {
+		return fmt.Errorf("Unable to install the app-json plugin: %s", err.Error())
 	}
 
 	directory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json")

plugins/apps/plugin.toml

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

plugins/builder-dockerfile/plugin.toml

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

plugins/builder-herokuish/builder-release

@@ -15,32 +15,21 @@ trigger-builder-herokuish-builder-release() {
 
   local CID
   local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
-  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.app-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=release --label=dokku"
 
   plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
-  if [[ -n $(config_export global) ]]; then
-    CID=$(config_export global | "$DOCKER_BIN" container run "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
-    if test "$("$DOCKER_BIN" container wait "$CID")" -ne 0; then
-      dokku_log_warn "Failure injecting global environment variables"
-      return 1
-    fi
 
-    "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
-    plugn trigger scheduler-register-retired "$APP" "$CID"
-  fi
-  if [[ -n $(config_export app "$APP") ]]; then
-    CID=$(config_export app "$APP" | "$DOCKER_BIN" container run "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
-    if test "$("$DOCKER_BIN" container wait "$CID")" -ne 0; then
-      dokku_log_warn "Failure injecting app environment variables"
-      return 1
-    fi
+  TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")"
+  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
-    "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
-    plugn trigger scheduler-register-retired "$APP" "$CID"
+  config_export global >"$TMP_WORK_DIR/00-global-env.sh"
+  config_export app "$APP" >"$TMP_WORK_DIR/01-app-env.sh"
+
+  if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
+    dokku_log_warn "Failure injecting environment variables"
+    return 1
   fi
 
-  docker-image-labeler --label=com.dokku.image-stage=release --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-release-buildpack "$APP" "$IMAGE_TAG"
   plugn trigger post-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE"
 }

plugins/builder-herokuish/dockerfiles/builder-release.Dockerfile

@@ -0,0 +1,4 @@
+ARG APP_IMAGE
+FROM $APP_IMAGE
+
+COPY 00-global-env.sh 01-app-env.sh /app/.profile.d/

plugins/builder-herokuish/dockerfiles/pre-build.Dockerfile

@@ -0,0 +1,5 @@
+ARG APP_IMAGE
+FROM $APP_IMAGE
+
+COPY .env.d /tmp/env
+COPY .env /app/.env

plugins/builder-herokuish/plugin.toml

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

plugins/builder-herokuish/pre-build-buildpack

@@ -8,10 +8,9 @@ trigger-builder-herokuish-pre-build-buildpack() {
   declare desc="builder-herokuish pre-build-buildpack plugin trigger"
   declare trigger="pre-build-buildpack"
   declare APP="$1"
-  local IMAGE CID
+  local IMAGE TMP_WORK_DIR
 
-  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.app-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"
 
   IMAGE=$(get_app_image_name "$APP")
 
@@ -19,26 +18,23 @@ trigger-builder-herokuish-pre-build-buildpack() {
   [[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=600
 
   dokku_log_info1 "Adding BUILD_ENV to build environment..."
+  TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")"
+  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
+  mkdir -p "$TMP_WORK_DIR/.env.d"
+
   # create build env files for use in buildpacks like this:
   # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
-  CID=$(config_bundle --merged "$APP" | "$DOCKER_BIN" container run "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /tmp/env; cat | tar -x -C /tmp/env")
-  if test "$("$DOCKER_BIN" container wait "$CID")" -ne 0; then
+  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"
+
+  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"
     return 1
   fi
 
-  "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
-  plugn trigger scheduler-register-retired "$APP" "$CID"
-
-  # create build env for 'old style' buildpacks and dokku plugins
-  CID=$(config_export app "$APP" --format envfile --merged | "$DOCKER_BIN" container run "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -i -a stdin "$IMAGE" /bin/bash -c "cat >> /app/.env")
-  if test "$("$DOCKER_BIN" container wait "$CID")" -ne 0; then
-    dokku_log_warn "Failure injecting old-style BUILD_ENV"
-    return 1
-  fi
-
-  "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
-  plugn trigger scheduler-register-retired "$APP" "$CID"
+  dokku_log_verbose_quiet "BUILD_ENV added successfully"
 }
 
 trigger-builder-herokuish-pre-build-buildpack "$@"

plugins/builder-null/plugin.toml

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

plugins/builder-pack/plugin.toml

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

plugins/builder/plugin.toml

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

plugins/buildpacks/plugin.toml

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

plugins/certs/plugin.toml

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

plugins/checks/install

@@ -21,7 +21,7 @@ migrate_checks_vars_0_5_0() {
       dokku_log_info2 "DOKKU_SKIP_ALL_CHECKS DOKKU_SKIP_DEFAULT_CHECKS"
       dokku_log_info2 "Please use dokku checks:[disable|enable] <app> to control zero downtime functionality"
       dokku_log_info2 ""
-      dokku_log_info2 "zero downtime checks disabled for app ($app)"
+      dokku_log_info2 "Zero downtime checks disabled for app ($app)"
       DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$app" DOKKU_CHECKS_ENABLED=0
     fi
     if [[ -n "$APP_SKIP_ALL_CHECKS" ]] || [[ -n "$APP_SKIP_DEFAULT_CHECKS" ]]; then
@@ -48,7 +48,7 @@ migrate_checks_vars_0_6_0() {
       dokku_log_info2 "DOKKU_CHECKS_ENABLED -> DOKKU_CHECKS_SKIPPED"
       if [[ "$APP_DOKKU_CHECKS_ENABLED" == "0" ]]; then
         dokku_log_info2 ""
-        dokku_log_info2 "zero downtime checks disabled for app ($app)"
+        dokku_log_info2 "Zero downtime checks disabled for app ($app)"
         DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$app" DOKKU_CHECKS_SKIPPED="_all_"
       fi
       DOKKU_QUIET_OUTPUT=1 config_unset --no-restart "$app" DOKKU_CHECKS_ENABLED || true

plugins/checks/plugin.toml

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

plugins/common/plugin.toml

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

plugins/common/properties.go

@@ -434,7 +434,7 @@ func PropertyWrite(pluginName string, appName string, property string, value str
 	}
 	defer file.Close()
 
-	fmt.Fprintf(file, value)
+	fmt.Fprint(file, value)
 	file.Chmod(0600)
 	SetPermissions(propertyPath, 0600)
 	return nil

plugins/config/plugin.toml

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

plugins/cron/plugin.toml

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

plugins/docker-options/plugin.toml

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

plugins/domains/plugin.toml

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

plugins/enter/plugin.toml

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

plugins/git/git-from-archive

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-git-git-from-archive() {
+  declare desc="updates a repository from an archive"
+  declare trigger="git-from-archive"
+  declare APP="$1" ARCHIVE_URL="$2" ARCHIVE_TYPE="$3" USER_NAME="${4:-Dokku}" USER_EMAIL="${4:-automated@dokku.sh}"
+
+  local TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  local TMP_WORK_DIR_2=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  local TMP_WORK_DIR_3=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  trap "rm -rf '$TMP_WORK_DIR' '$TMP_WORK_DIR_2' '$TMP_WORK_DIR_3' >/dev/null" RETURN INT TERM EXIT
+
+  if [[ "$ARCHIVE_URL" == "--" ]]; then
+    dokku_log_info1 "Fetching $ARCHIVE_TYPE file from stdin"
+    tee "$TMP_WORK_DIR_2/src.$ARCHIVE_TYPE" | wc -c
+  else
+    dokku_log_info1 "Downloading $ARCHIVE_TYPE file from $ARCHIVE_URL"
+    curl -# -L "$ARCHIVE_URL" -o "$TMP_WORK_DIR_2/src.$ARCHIVE_TYPE"
+  fi
+
+  dokku_log_info1 "Generating build context"
+  if [[ "$ARCHIVE_TYPE" == "tar" ]]; then
+    local COMMON_PREFIX=$(tar -tf "$TMP_WORK_DIR_2/src.tar" | sed -e 'N;s/^\(.*\).*\n\1.*$/\1\n\1/;D')
+    local BOGUS_PARTS=$(echo "$COMMON_PREFIX " | awk 'BEGIN{FS="/"} {print NF-1}')
+    dokku_log_verbose "Striping $BOGUS_PARTS worth of directories from tarball"
+    tar -x -C "$TMP_WORK_DIR_3" -f "$TMP_WORK_DIR_2/src.tar" --strip-components="$BOGUS_PARTS"
+  elif [[ "$ARCHIVE_TYPE" == "tar.gz" ]]; then
+    dokku_log_verbose "Extracting gzipped tarball"
+    tar -x -C "$TMP_WORK_DIR_3" -f "$TMP_WORK_DIR_2/src.tar.gz" -z
+  elif [[ "$ARCHIVE_TYPE" == "zip" ]]; then
+    dokku_log_verbose "Extracting zipball"
+    unzip -d "$TMP_WORK_DIR_3" "$TMP_WORK_DIR_2/src.zip"
+  fi
+
+  chmod -R u+r "$TMP_WORK_DIR_3"
+
+  # drop any top-level folder components that resulted from the folder extraction
+  if [[ "$(find "$TMP_WORK_DIR_3" -maxdepth 1 -printf %y)" == "dd" ]]; then
+    dokku_log_verbose "Stripping top-level archive folder components"
+    local subpath="$(find "$TMP_WORK_DIR_3" -mindepth 1 -maxdepth 1 -type d)"
+    pushd "$subpath" >/dev/null
+    find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
+    popd &>/dev/null || pushd "/tmp" >/dev/null
+  else
+    dokku_log_verbose "Moving unarchived files and folders into place"
+    pushd "$TMP_WORK_DIR_3" >/dev/null
+    find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
+    popd &>/dev/null || pushd "/tmp" >/dev/null
+  fi
+
+  plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
+}
+
+trigger-git-git-from-archive "$@"

plugins/git/git-from-image

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-git-git-from-image() {
+  declare desc="updates a repository from a docker image"
+  declare trigger="git-from-image"
+  declare APP="$1" DOCKER_IMAGE="$2" BUILD_DIR="$3" USER_NAME="${4:-Dokku}" USER_EMAIL="${4:-automated@dokku.sh}"
+
+  local TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
+
+  dokku_log_info1 "Generating build context"
+  if [[ -n "$BUILD_DIR" ]]; then
+    if [[ ! -d "$BUILD_DIR" ]]; then
+      dokku_log_fail "Invalid BUILD_DIR specified for docker build context"
+    fi
+
+    dokku_log_verbose "Syncing build directory context"
+    rsync -a "$BUILD_DIR/" "$TMP_WORK_DIR"
+  fi
+
+  dokku_log_verbose "Setting Dockerfile"
+  touch "$TMP_WORK_DIR/Dockerfile"
+  echo "FROM $DOCKER_IMAGE" >>"$TMP_WORK_DIR/Dockerfile"
+  echo "LABEL com.dokku.docker-image-labeler/alternate-tags=[\\\"$DOCKER_IMAGE\\\"]" >>"$TMP_WORK_DIR/Dockerfile"
+
+  plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
+}
+
+trigger-git-git-from-image "$@"

plugins/git/internal-functions

@@ -52,50 +52,7 @@ cmd-git-from-archive() {
     dokku_log_fail "Invalid archive type specified, valid archive types include: tar, tar.gz, zip"
   fi
 
-  local TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
-  local TMP_WORK_DIR_2=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
-  local TMP_WORK_DIR_3=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
-  trap "rm -rf '$TMP_WORK_DIR' '$TMP_WORK_DIR_2' '$TMP_WORK_DIR_3' >/dev/null" RETURN INT TERM EXIT
-
-  if [[ "$ARCHIVE_URL" == "--" ]]; then
-    dokku_log_info1 "Fetching $ARCHIVE_TYPE file from stdin"
-    tee "$TMP_WORK_DIR_2/src.$ARCHIVE_TYPE" | wc -c
-  else
-    dokku_log_info1 "Downloading $ARCHIVE_TYPE file from $ARCHIVE_URL"
-    curl -# -L "$ARCHIVE_URL" -o "$TMP_WORK_DIR_2/src.$ARCHIVE_TYPE"
-  fi
-
-  dokku_log_info1 "Generating build context"
-  if [[ "$ARCHIVE_TYPE" == "tar" ]]; then
-    local COMMON_PREFIX=$(tar -tf "$TMP_WORK_DIR_2/src.tar" | sed -e 'N;s/^\(.*\).*\n\1.*$/\1\n\1/;D')
-    local BOGUS_PARTS=$(echo "$COMMON_PREFIX " | awk 'BEGIN{FS="/"} {print NF-1}')
-    dokku_log_verbose "Striping $BOGUS_PARTS worth of directories from tarball"
-    tar -x -C "$TMP_WORK_DIR_3" -f "$TMP_WORK_DIR_2/src.tar" --strip-components="$BOGUS_PARTS"
-  elif [[ "$ARCHIVE_TYPE" == "tar.gz" ]]; then
-    dokku_log_verbose "Extracting gzipped tarball"
-    tar -x -C "$TMP_WORK_DIR_3" -f "$TMP_WORK_DIR_2/src.tar.gz" -z
-  elif [[ "$ARCHIVE_TYPE" == "zip" ]]; then
-    dokku_log_verbose "Extracting zipball"
-    unzip -d "$TMP_WORK_DIR_3" "$TMP_WORK_DIR_2/src.zip"
-  fi
-
-  chmod -R u+r "$TMP_WORK_DIR_3"
-
-  # drop any top-level folder components that resulted from the folder extraction
-  if [[ "$(find "$TMP_WORK_DIR_3" -maxdepth 1 -printf %y)" == "dd" ]]; then
-    dokku_log_verbose "Stripping top-level archive folder components"
-    local subpath="$(find "$TMP_WORK_DIR_3" -mindepth 1 -maxdepth 1 -type d)"
-    pushd "$subpath" >/dev/null
-    find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
-    popd &>/dev/null || pushd "/tmp" >/dev/null
-  else
-    dokku_log_verbose "Moving unarchived files and folders into place"
-    pushd "$TMP_WORK_DIR_3" >/dev/null
-    find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
-    popd &>/dev/null || pushd "/tmp" >/dev/null
-  fi
-
-  plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
+  plugn trigger git-from-archive "$APP" "$ARCHIVE_URL" "$ARCHIVE_TYPE" "$USER_NAME" "$USER_EMAIL"
 }
 
 cmd-git-auth() {
@@ -152,25 +109,7 @@ cmd-git-from-image() {
   verify_app_name "$APP"
   [[ -z "$DOCKER_IMAGE" ]] && dokku_log_fail "Please specify a docker image"
 
-  local TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
-  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
-
-  dokku_log_info1 "Generating build context"
-  if [[ -n "$BUILD_DIR" ]]; then
-    if [[ ! -d "$BUILD_DIR" ]]; then
-      dokku_log_fail "Invalid BUILD_DIR specified for docker build context"
-    fi
-
-    dokku_log_verbose "Syncing build directory context"
-    rsync -a "$BUILD_DIR/" "$TMP_WORK_DIR"
-  fi
-
-  dokku_log_verbose "Setting Dockerfile"
-  touch "$TMP_WORK_DIR/Dockerfile"
-  echo "FROM $DOCKER_IMAGE" >>"$TMP_WORK_DIR/Dockerfile"
-  echo "LABEL com.dokku.docker-image-labeler/alternate-tags=[\\\"$DOCKER_IMAGE\\\"]" >>"$TMP_WORK_DIR/Dockerfile"
-
-  plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
+  plugn trigger git-from-image "$APP" "$DOCKER_IMAGE" "$BUILD_DIR" "$USER_NAME" "$USER_EMAIL"
 }
 
 cmd-git-sync() {

plugins/git/plugin.toml

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

plugins/logs/functions.go

@@ -1,6 +1,7 @@
 package logs
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -128,23 +129,9 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
 
 	u.Scheme = strings.ReplaceAll(u.Scheme, "-", "_")
 
-	t := fmt.Sprintf("type=%s", u.Scheme)
-	i := fmt.Sprintf("inputs[]=docker-source:%s", appName)
-	if appName == "--global" {
-		i = "inputs[]=docker-global-source"
-	}
-	if appName == "--null" {
-		i = "inputs[]=docker-null-source"
-	}
-
-	initialQuery := fmt.Sprintf("%s&%s", t, i)
 	query := u.RawQuery
-	if query == "" {
-		query = initialQuery
-	} else if strings.HasPrefix(query, "&") {
-		query = fmt.Sprintf("%s%s", initialQuery, query)
-	} else {
-		query = fmt.Sprintf("%s&%s", initialQuery, query)
+	if strings.HasPrefix(query, "&") {
+		query = strings.TrimPrefix(query, "&")
 	}
 
 	b, err := qson.ToJSON(query)
@@ -156,6 +143,15 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
 		return data, err
 	}
 
+	data["type"] = u.Scheme
+	data["inputs"] = []string{"docker-source:" + appName}
+	if appName == "--global" {
+		data["inputs"] = []string{"docker-global-source"}
+	}
+	if appName == "--null" {
+		data["inputs"] = []string{"docker-null-source"}
+	}
+
 	return data, nil
 }
 
@@ -222,6 +218,8 @@ func writeVectorConfig() error {
 		return err
 	}
 
+	b = bytes.Replace(b, []byte("\\u0026"), []byte("&"), -1)
+
 	vectorConfig := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "logs", "vector.json")
 	if err := common.WriteSliceToFile(vectorConfig, []string{string(b)}); err != nil {
 		return err

plugins/logs/logs.go

@@ -24,7 +24,7 @@ var (
 )
 
 // VectorImage contains the default vector image to run
-const VectorImage = "timberio/vector:0.12.X-debian"
+const VectorImage = "timberio/vector:0.16.X-debian"
 
 // GetFailedLogs outputs failed deploy logs for a given app
 func GetFailedLogs(appName string) error {

plugins/logs/plugin.toml

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

plugins/network/network.go

@@ -174,11 +174,14 @@ func GetContainerPort(appName, processType string, containerID string, isHerokui
 				break
 			}
 		}
-		cmd := sh.Command(common.DockerBin(), "container", "port", containerID, port)
-		cmd.Stderr = ioutil.Discard
-		b, err := cmd.Output()
-		if err == nil {
-			port = strings.Split(string(b[:]), ":")[1]
+
+		if port != "" {
+			cmd := sh.Command(common.DockerBin(), "container", "port", containerID, port)
+			cmd.Stderr = ioutil.Discard
+			b, err := cmd.Output()
+			if err == nil {
+				port = strings.Split(string(b[:]), ":")[1]
+			}
 		}
 	} else {
 		port = "5000"

plugins/network/plugin.toml

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

plugins/nginx-vhosts/functions

@@ -164,7 +164,7 @@ configure_nginx_ports() {
 
   if [[ -z "$DOKKU_PROXY_PORT" ]] && [[ -z "$RAW_TCP_PORTS" ]]; then
     if [[ "$IS_APP_VHOST_ENABLED" == "false" ]]; then
-      dokku_log_info1 "no proxy port set. setting to random open high port"
+      dokku_log_info1 "No proxy port set, setting to random open high port"
       local PROXY_PORT=$(get_available_port)
     else
       local PROXY_PORT=$(config_get --global DOKKU_PROXY_PORT)
@@ -177,7 +177,7 @@ configure_nginx_ports() {
       local PROXY_SSL_PORT=$(config_get --global DOKKU_PROXY_SSL_PORT)
       PROXY_SSL_PORT=${PROXY_SSL_PORT:=443}
       if [[ -z "$RAW_TCP_PORTS" ]] && [[ "$IS_APP_VHOST_ENABLED" == "false" ]]; then
-        dokku_log_info1 "no proxy ssl port set. setting to random open high port"
+        dokku_log_info1 "No proxy ssl port set, setting to random open high port"
         PROXY_SSL_PORT=$(get_available_port)
       fi
       DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$APP" DOKKU_PROXY_SSL_PORT="$PROXY_SSL_PORT"
@@ -553,13 +553,13 @@ nginx_build_config() {
     fi
   else
     # note because this clause is long. if the proxy is disabled:
-    dokku_log_info1 "nginx support is disabled for app ($APP)."
+    dokku_log_info1 "Nginx support is disabled for app ($APP)"
     if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
-      dokku_log_info1 "deleting nginx.conf"
+      dokku_log_info1 "Deleting nginx.conf"
       rm "$DOKKU_ROOT/$APP/nginx.conf"
 
       if (is_deployed "$APP"); then
-        dokku_log_info1 "reloading nginx after nginx.conf deletion"
+        dokku_log_info1 "Reloading nginx after nginx.conf deletion"
         validate_nginx && restart_nginx >/dev/null
       fi
     fi

plugins/nginx-vhosts/plugin.toml

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

plugins/plugin/plugin.toml

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

plugins/proxy/plugin.toml

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

plugins/ps/plugin.toml

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

plugins/registry/plugin.toml

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

plugins/repo/plugin.toml

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

plugins/resource/plugin.toml

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

plugins/run/plugin.toml

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

plugins/scheduler-docker-local/check-deploy

@@ -87,9 +87,9 @@ trigger-scheduler-docker-local-check-deploy() {
     local id="$1"
     rm -rf "$CHECK_DEPLOY_TMP_WORK_DIR" &>/dev/null || true
     if [[ $id ]]; then
-      dokku_log_info2_quiet "$APP $DOKKU_APP_CONTAINER_TYPE container output:"
+      dokku_log_info2_quiet "Start of $APP $DOKKU_APP_CONTAINER_TYPE container output:"
       dokku_container_log_verbose_quiet "$id"
-      dokku_log_info2_quiet "end $APP $DOKKU_APP_CONTAINER_TYPE container output"
+      dokku_log_info2_quiet "End of $APP $DOKKU_APP_CONTAINER_TYPE container output"
     fi
   }
   trap "checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID" RETURN INT TERM EXIT

plugins/scheduler-docker-local/core-post-deploy

@@ -55,8 +55,13 @@ trigger-scheduler-docker-local-core-post-deploy() {
     local ID=$(cat "$container")
     local CURRENT_NAME=$("$DOCKER_BIN" container inspect --format '{{.Name}}' "$ID" | tr -d /)
     if [[ -n "$CURRENT_NAME" ]]; then
-      dokku_log_verbose_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
-      "$DOCKER_BIN" container rename "$CURRENT_NAME" "$NAME" >/dev/null
+      dokku_log_verbose_quiet "Renaming container $CURRENT_NAME (${ID:0:12}) to $NAME"
+      if ! "$DOCKER_BIN" container rename "$ID" "$NAME" >/dev/null; then
+        dokku_log_warn "Failed to rename container $CURRENT_NAME (${ID:0:12})"
+        dokku_log_info2_quiet "Start $APP (${ID:0:12}) container output:"
+        dokku_container_log_verbose_quiet "$ID"
+        dokku_log_info2_quiet "End $APP (${ID:0:12}) container output"
+      fi
     fi
   done
   shopt -u nullglob

plugins/scheduler-docker-local/internal-functions

@@ -238,10 +238,16 @@ fn-scheduler-docker-local-register-retired() {
 
 fn-scheduler-docker-local-start-app-container() {
   declare desc="starts a single app container"
-  declare APP="$1" DOCKER_ARGS="$2"
+  declare APP="$1"
+  shift
+
+  local DOCKER_ARGS
+  for i in "$@"; do
+    DOCKER_ARGS="$DOCKER_ARGS \"$i\""
+  done
+  eval set -- $DOCKER_ARGS
 
-  declare -a __DOKKU_DOCKER_ARG_ARRAY
-  eval "__DOKKU_DOCKER_ARG_ARRAY=($DOCKER_ARGS)"
   eval "$(config_export app "$APP" --merged)"
-  "$DOCKER_BIN" container create "${__DOKKU_DOCKER_ARG_ARRAY[@]}"
+  # shellcheck disable=SC2124
+  "$DOCKER_BIN" container create "$@"
 }

plugins/scheduler-docker-local/plugin.toml

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

plugins/scheduler-docker-local/pre-deploy

@@ -37,7 +37,7 @@ scheduler-docker-local-pre-deploy-chown-app() {
     CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
     DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
 
-    filterdArgs=("--cpus" "--gpus" "--memory" "--memory-reservation" "--memory-swap" "--publish" "--publish-all" "-p" "-P")
+    filterdArgs=("--cpus" "--gpus" "--memory" "--memory-reservation" "--memory-swap" "--publish" "--publish-all" "-p" "-P" "--restart")
     for filteredArg in "${filterdArgs[@]}"; do
       # shellcheck disable=SC2001
       DOCKER_ARGS=$(sed -e "s/$filteredArg=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")

plugins/scheduler-docker-local/scheduler-deploy

@@ -82,12 +82,13 @@ trigger-scheduler-docker-local-scheduler-deploy() {
       # start the app
       local DOCKER_ARGS
       DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
-      DOCKER_ARGS+=" --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "
-      DOCKER_ARGS+=" --env=DYNO=$DYNO "
-      DOCKER_ARGS+=" --init "
+      DOCKER_ARGS+=" --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO"
+      DOCKER_ARGS+=" --env=DYNO=$DYNO"
+      DOCKER_ARGS+=" --name=$APP.$DYNO.upcoming-$RANDOM"
+      DOCKER_ARGS+=" --init"
       DOCKER_ARGS+=" $DOCKER_RUN_LABEL_ARGS $DOKKU_GLOBAL_RUN_ARGS "
       DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
-      [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" --env=TRACE=true "
+      [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" --env=TRACE=true"
 
       local START_CMD
       [[ "$DOKKU_HEROKUISH" == "true" ]] && START_CMD="/start $PROC_TYPE"
@@ -104,18 +105,20 @@ trigger-scheduler-docker-local-scheduler-deploy() {
           fi
 
           if [[ "$DOKKU_NETWORK_BIND_ALL" == "true" ]]; then
-            DOCKER_ARGS+=" -p $p "
+            DOCKER_ARGS+=" -p $p"
           fi
         done
       fi
 
-      DOCKER_ARGS+=" --env=PORT=$DOKKU_PORT "
+      DOCKER_ARGS+=" --env=PORT=$DOKKU_PORT"
 
       START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH" "$DOKKU_PORT")
-      DOCKER_ARGS+=" $IMAGE "
-      DOCKER_ARGS+=" $START_CMD "
+      DOCKER_ARGS+=" $IMAGE"
+      DOCKER_ARGS+=" $START_CMD"
 
-      cid=$(fn-scheduler-docker-local-start-app-container "$APP" "$DOCKER_ARGS")
+      declare -a ARG_ARRAY
+      eval "ARG_ARRAY=($DOCKER_ARGS)"
+      cid=$(fn-scheduler-docker-local-start-app-container "$APP" "${ARG_ARRAY[@]}")
 
       plugn trigger post-container-create "app" "$cid" "$APP" "deploy" "$PROC_TYPE"
       "$DOCKER_BIN" container start "$cid" >/dev/null || true
@@ -217,7 +220,7 @@ fn-scheduler-docker-local-extract-start-cmd() {
   fi
 
   DOKKU_DOCKERFILE_START_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_START_CMD || true)
-  DOKKU_PROCFILE_START_CMD=$(plugn trigger procfile-get-command "$APP" "$PROC_TYPE" "$PORT")
+  DOKKU_PROCFILE_START_CMD=$(plugn trigger procfile-get-command "$APP" "$PROC_TYPE" "$PORT" 2>/dev/null || echo '')
   START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
   echo "$START_CMD"
 }

plugins/scheduler-docker-local/scheduler-run

@@ -14,12 +14,12 @@ trigger-scheduler-docker-local-scheduler-run() {
 
   declare RUN_ENV=("${@:1:ENV_COUNT}")
   shift "$ENV_COUNT"
+  declare RUN_COMMAND=()
 
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
   fi
 
-  local DOCKER_RUN_LABEL_ARGS="--label=com.dokku.app-name=$APP"
   local IMAGE_TAG=$(get_running_image_tag "$APP")
   local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
 
@@ -44,13 +44,13 @@ trigger-scheduler-docker-local-scheduler-run() {
   DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG")
   DOCKER_ARGS+=" -e DYNO=$PROCESS_TYPE.$DYNO_NUMBER --name $APP.$PROCESS_TYPE.$DYNO_NUMBER"
 
-  declare -a ARG_ARRAY
-  eval "ARG_ARRAY=($DOCKER_ARGS)"
-
   if [[ "$DOKKU_RM_CONTAINER" ]]; then
     DOCKER_ARGS+=" --rm"
   fi
-  has_tty && DOCKER_ARGS+=" --interactive --tty"
+  if has_tty; then
+    DOCKER_ARGS+=" --interactive"
+    DOCKER_ARGS+=" --tty"
+  fi
   for env_pair in "${RUN_ENV[@]}"; do
     DOCKER_ARGS+=" --env=$env_pair"
   done
@@ -76,13 +76,35 @@ trigger-scheduler-docker-local-scheduler-run() {
   fi
 
   # shellcheck disable=SC2124
-  DOCKER_ARGS+=" --label=com.dokku.container-type=$PROCESS_TYPE ${DOCKER_RUN_LABEL_ARGS[@]} $DOKKU_GLOBAL_RUN_ARGS"
-  DOCKER_ARGS+=" $IMAGE "
-  DOCKER_ARGS+=" $EXEC_CMD "
-  # shellcheck disable=SC2124
-  DOCKER_ARGS+=" $@"
+  DOCKER_ARGS+=" --label=com.dokku.container-type=$PROCESS_TYPE"
+  DOCKER_ARGS+=" --label=com.dokku.app-name=$APP"
+  # $DOKKU_GLOBAL_RUN_ARGS"
+  DOCKER_ARGS+=" $IMAGE"
+  DOCKER_ARGS+=" $EXEC_CMD"
 
-  CONTAINER_ID=$(fn-scheduler-docker-local-start-app-container "$APP" "$DOCKER_ARGS")
+  declare -a ARG_ARRAY
+  eval "ARG_ARRAY=($DOCKER_ARGS)"
+
+  RUN_COMMAND=("$@")
+  if [[ "${#RUN_COMMAND[@]}" -eq 0 ]]; then
+    if [[ -z "$DOKKU_SHELL" ]]; then
+      local DOKKU_APP_SHELL=$(config_get "$APP" DOKKU_APP_SHELL || true)
+      local DOKKU_GLOBAL_SHELL=$(config_get --global DOKKU_APP_SHELL || true)
+      local DOKKU_SHELL=${DOKKU_APP_SHELL:="$DOKKU_GLOBAL_SHELL"}
+    fi
+
+    if [[ -z "$DOKKU_SHELL" ]]; then
+      DOKKU_SHELL="/bin/bash"
+    fi
+    ARG_ARRAY=("${ARG_ARRAY[@]}" "$DOKKU_SHELL")
+  else
+    ARG_ARRAY=("${ARG_ARRAY[@]}" "${RUN_COMMAND[@]}")
+    # for run_arg in "${RUN_COMMAND[@]}"; do
+    #   DOCKER_ARGS+=" ${run_arg} "
+    # done
+  fi
+
+  CONTAINER_ID=$(fn-scheduler-docker-local-start-app-container "$APP" "${ARG_ARRAY[@]}")
   plugn trigger post-container-create "app" "$CONTAINER_ID" "$APP" "run"
 
   declare -a DOCKER_START_ARGS_ARRAY

plugins/scheduler-null/plugin.toml

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

plugins/shell/plugin.toml

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

plugins/ssh-keys/plugin.toml

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

plugins/storage/bin/chown-storage-dir

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+main() {
+  declare desc="chowns a storage directory"
+  declare DIRECTORY="$1" CHOWN_ID="$2"
+
+  if [[ -z "$DIRECTORY" ]]; then
+    echo " !     Please specify a directory to create" 1>&2
+    exit 1
+  fi
+
+  if [[ ! "$DIRECTORY" =~ ^[A-Za-z0-9\\_-]+$ ]]; then
+    echo " !     Directory can only contain the following set of characters: [A-Za-z0-9_-]" 1>&2
+    exit 1
+  fi
+
+  if [[ "$CHOWN_ID" != "32767" ]] && [[ "$CHOWN_ID" != "1000" ]] && [[ "$CHOWN_ID" != "2000" ]]; then
+    echo " !     Unsupported chown permissions. Supported values: 32767, 1000, 2000"
+    exit 1
+  fi
+
+  chown -R "$CHOWN_ID:$CHOWN_ID" "${DOKKU_LIB_ROOT}/data/storage/$DIRECTORY"
+}
+
+main "$@"

plugins/storage/help-functions

@@ -27,6 +27,7 @@ help_desc
 fn-help-content() {
   declare desc="return help content"
   cat <<help_content
+    storage:ensure-directory [--chown option] <directory>, Creates a persistent storage directory in the recommended storage path
     storage:list <app>, List bind mounts for app's container(s) (host:container)
     storage:mount <app> <host-dir:container-dir>, Create a new bind mount
     storage:report [<app>] [<flag>], Displays a checks report for one or more apps

plugins/storage/install

@@ -5,9 +5,40 @@ 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:dokku "${DOKKU_LIB_ROOT}/data/storage"
+  STORAGE_SUDOERS_FILE="/etc/sudoers.d/dokku-storage"
+
+  case "$DOKKU_DISTRO" in
+    debian)
+      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
+      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
+      ;;
+
+    ubuntu)
+      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
+      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
+      ;;
+
+    opensuse)
+      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
+      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
+      ;;
+
+    arch)
+      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
+      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
+      ;;
+
+    centos | fedora | rhel)
+      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
+      echo "Defaults:dokku !requiretty" >>"$STORAGE_SUDOERS_FILE"
+      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
+
+      ;;
+  esac
 }
 
 trigger-storage-install "$@"

plugins/storage/internal-functions

@@ -5,6 +5,62 @@ source "$PLUGIN_AVAILABLE_PATH/storage/functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 
+cmd-storage-ensure-directory() {
+  declare desc="creates a persistent storage directory in the recommended storage path"
+  declare cmd="storage:ensure-directory"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare DIRECTORY CHOWN_FLAG
+
+  CHOWN_FLAG=herokuish
+  skip=false
+  for arg in "$@"; do
+    if [[ "$arg" == "--chown" ]]; then
+      skip=true
+      continue
+    fi
+
+    if [[ "$skip" == "true" ]]; then
+      CHOWN_FLAG="$arg"
+      skip=false
+      continue
+    fi
+
+    if [[ -z "$DIRECTORY" ]]; then
+      DIRECTORY="$arg"
+    fi
+  done
+
+  if [[ -z "$DIRECTORY" ]]; then
+    dokku_log_fail "Please specify a directory to create"
+  fi
+
+  if [[ ! "$DIRECTORY" =~ ^[A-Za-z0-9\\_-]+$ ]]; then
+    dokku_log_fail "Directory can only contain the following set of characters: [A-Za-z0-9_-]"
+  fi
+
+  if [[ "$CHOWN_FLAG" == "herokuish" ]]; then
+    CHOWN_FLAG="32767"
+  elif [[ "$CHOWN_FLAG" == "heroku" ]]; then
+    CHOWN_FLAG="1000"
+  elif [[ "$CHOWN_FLAG" == "packeto" ]]; then
+    CHOWN_FLAG="2000"
+  elif [[ "$CHOWN_FLAG" == "false" ]]; then
+    CHOWN_FLAG="false"
+  else
+    dokku_log_fail "Unsupported chown permissions"
+  fi
+
+  local storage_directory="${DOKKU_LIB_ROOT}/data/storage/$DIRECTORY"
+  dokku_log_info1 "Ensuring ${storage_directory} exists"
+  mkdir -p "${storage_directory}"
+  if [[ "$CHOWN_FLAG" != "false" ]]; then
+    dokku_log_verbose_quiet "Setting directory ownership to $CHOWN_FLAG:$CHOWN_FLAG"
+    sudo "$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir" "$DIRECTORY" "$CHOWN_FLAG"
+  fi
+
+  dokku_log_verbose_quiet "Directory ready for mounting"
+}
+
 cmd-storage-report() {
   declare desc="displays a storage report for one or more apps"
   declare cmd="storage:report"

plugins/storage/plugin.toml

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

plugins/storage/subcommands/ensure-directory

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/storage/internal-functions"
+
+cmd-storage-ensure-directory "$@"

plugins/tags/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.25.2"
+version = "0.25.5"
 [plugin.config]

plugins/tar/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.25.2"
+version = "0.25.5"
 [plugin.config]

plugins/trace/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.25.2"
+version = "0.25.5"
 [plugin.config]

tests/apps/dockerfile-release/Pipfile.lock

@@ -18,11 +18,11 @@
     "default": {
         "asgiref": {
             "hashes": [
-                "sha256:92906c611ce6c967347bbfea733f13d6313901d54dcca88195eaeb52b2a8e8ee",
-                "sha256:d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78"
+                "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9",
+                "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.3.4"
+            "version": "==3.4.1"
         },
         "dj-database-url": {
             "hashes": [
@@ -34,11 +34,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:a523d62b7ab2908f551dabc32b99017a86aa7784e32b761708e52be3dce6d35d",
-                "sha256:dc41bf07357f1f4810c1c555b685cb51f780b41e37892d6cc92b89789f2847e1"
+                "sha256:9f8be75646f62204320b195062b1d696ba28aa3d45ee72fb7c888ffaebc5bdb2",
+                "sha256:a6e0d1ff11095b7394c079ade7094c73b2dc3df4a7a373c9b58ed73b77a97feb"
             ],
             "index": "pypi",
-            "version": "==3.1.12"
+            "version": "==3.1.13"
         },
         "djangorestframework": {
             "hashes": [
@@ -103,11 +103,11 @@
         },
         "sqlparse": {
             "hashes": [
-                "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0",
-                "sha256:0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"
+                "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae",
+                "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==0.4.1"
+            "version": "==0.4.2"
         },
         "whitenoise": {
             "hashes": [

tests/apps/go-fail-postdeploy/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.9.1
+FROM golang:1.17.1
 
 EXPOSE 3000/tcp
 

tests/apps/go-fail-predeploy/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.9.1
+FROM golang:1.17.1
 
 EXPOSE 3000/tcp
 

tests/apps/gogrpc/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12
+FROM golang:1.17.1
 
 RUN mkdir /app
 WORKDIR /app

tests/apps/gogrpc/go.mod

@@ -1,21 +1,18 @@
 module github.com/dokku/dokko/tests/apps/gorpc
 
-go 1.12
+go 1.17
 
 require (
-	cloud.google.com/go v0.44.3 // indirect
 	github.com/golang/protobuf v1.5.2
-	github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
-	github.com/kr/pty v1.1.8 // indirect
-	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
-	golang.org/x/mobile v0.0.0-20190814143026-e8b3e6111d02 // indirect
 	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
 	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
-	golang.org/x/tools v0.0.0-20190822000311-fc82fb2afd64 // indirect
-	google.golang.org/api v0.9.0 // indirect
+	golang.org/x/text v0.3.2 // indirect
 	google.golang.org/grpc v1.29.1
-	honnef.co/go/tools v0.0.1-2019.2.2 // indirect
+)
+
+require (
+	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 )
 
 replace google.golang.org/grpc/examples/helloworld/helloworld => ./helloworld

tests/apps/gogrpc/go.sum

@@ -1,203 +1,64 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190814143026-e8b3e6111d02/go.mod h1:z5wpDCy2wbnXyFdvEuY3LhY9gBUL86/IOILm+Hsjx+E=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190822000311-fc82fb2afd64/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
-google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
-google.golang.org/grpc v1.25.0 h1:ItERT+UbGdX+s4u+nQNlVM/Q7cbmf7icKfvzbWqVtq0=
-google.golang.org/grpc v1.25.0/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.0 h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo=
-google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

tests/apps/php/composer.lock

@@ -1000,16 +1000,16 @@
     "packages-dev": [
         {
             "name": "heroku/heroku-buildpack-php",
-            "version": "v197",
+            "version": "v198",
             "source": {
                 "type": "git",
                 "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "0b77e568edae1c65d7cfb2f56db80291ca8688cf"
+                "reference": "043613ce119387da7e04b2ba8db00fe12ab0b55c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/0b77e568edae1c65d7cfb2f56db80291ca8688cf",
-                "reference": "0b77e568edae1c65d7cfb2f56db80291ca8688cf",
+                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/043613ce119387da7e04b2ba8db00fe12ab0b55c",
+                "reference": "043613ce119387da7e04b2ba8db00fe12ab0b55c",
                 "shasum": ""
             },
             "bin": [
@@ -1037,7 +1037,7 @@
                 "nginx",
                 "php"
             ],
-            "time": "2021-08-26T17:23:39+00:00"
+            "time": "2021-09-28T23:39:37+00:00"
         }
     ],
     "aliases": [],

tests/apps/zombies-dockerfile-no-tini/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12
+FROM golang:1.17.1
 
 ADD . /go/src/github.com/dokku/apps/web
 WORKDIR /go/src/github.com/dokku/apps/web