Release 0.31.2

# History

## 0.31.2

Install/update via the bootstrap script:

```shell
wget -NP . https://dokku.com/install/v0.31.2/bootstrap.sh
sudo DOKKU_TAG=v0.31.2 bash bootstrap.sh
```

### Bug Fixes

- #6154: @josegonzalez Ensure app clones have domains setup
- #6164: @josegonzalez Use correct path for openresty letsencrypt data
- #6165: @josegonzalez Ensure we cleanup extracted files prior to next deployment
- #6166: @josegonzalez Remove unused source from openresty trigger
- #6163: @josegonzalez Add missing triggers for openresty-vhosts plugin
- #6151: @josegonzalez Do not pass an empty argument to scheduler-run when triggering cron tasks manually
- #6150: @josegonzalez Correct issue where temp file cleanup fails deploy

### Documentation

- #6167: @josegonzalez Correct svg path on homepage
- #6153: @imankulov Fix superscript typos in plugin documentation

### Tests

- #6152: @josegonzalez Use buildjet for building arm images
- #6149: @josegonzalez Fix issue where CI cannot install docker-compose-plugin

### Dependencies

- #6161: @josegonzalez Upgrade sigil to 0.10.1
- #6162: @josegonzalez Upgrade herokuish to 0.7.1
- #6160: @josegonzalez Upgrade sshcommand to 0.17.1
- #6159: @josegonzalez Upgrade procfile-util to 0.16.0
- #6158: @josegonzalez Upgrade netrc to 0.7.1
- #6157: @josegonzalez Upgrade lambda-builder to 0.5.0
- #6147: @dependabot[bot] chore(deps): bump tj-actions/changed-files from 37.6.1 to 38.1.0
- #6145: @dependabot[bot] chore(deps): bump mkdocs-material from 9.2.2 to 9.2.3 in /docs/_build
- #6139: @dependabot[bot] chore(deps): bump flask from 2.3.2 to 2.3.3 in /tests/apps/multi
- #6140: @dependabot[bot] chore(deps): bump flask from 2.3.2 to 2.3.3 in /tests/apps/python-flask
- #6141: @dependabot[bot] chore(deps): bump mkdocs-material from 9.1.21 to 9.2.2 in /docs/_build

### Other

- #6148: @josegonzalez Add missing relabel command to docker-image-labeler for CNB builder

.devcontainer/Dockerfile

@@ -7,8 +7,9 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \
   apt-get autoremove --yes && \
   rm -rf /var/lib/apt/lists/*
 
-RUN wget https://dl.google.com/go/go1.16.10.linux-amd64.tar.gz && \
-  tar -xvf go1.16.10.linux-amd64.tar.gz && \
+ARG TARGETARCH
+RUN wget https://dl.google.com/go/go1.19.6.linux-${TARGETARCH}.tar.gz && \
+  tar -xvf go1.19.6.linux-${TARGETARCH}.tar.gz && \
   mv go /usr/local
 
 RUN GOROOT=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@latest 2>&1

.devcontainer/bin/setup-dev-env

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+install-go-devtools() {
+  go install github.com/go-delve/delve/cmd/dlv@latest
+  go install honnef.co/go/tools/cmd/staticcheck@latest
+}
+
+install-go-mods() {
+  local plugin_root="/root/go/src/github.com/dokku/dokku/plugins"
+
+  export GO111MODULE=off
+  echo "-----> Fetching onsi/gomega dependency for tests"
+  go get github.com/onsi/gomega || true
+
+  echo "-----> Fetching spf13/pflag dependency for subcommands"
+  go get github.com/spf13/pflag || true
+  pushd "$plugin_root" >/dev/null || true
+  find "$plugin_root/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    pushd "$plugin_root/$plugin" >/dev/null || true
+    if [[ -f "go.mod" ]]; then
+      echo "-----> Fetching dependencies for $plugin plugin"
+      go get || true
+    fi
+    popd >/dev/null || true
+  done
+  popd >/dev/null || true
+}
+
+setup-ci() {
+  local dokku_root="/root/go/src/github.com/dokku/dokku"
+  pushd "$plugin_root" >/dev/null || true
+  make ci-dependencies setup-deploy-tests
+  popd >/dev/null || true
+}
+
+main() {
+  install-go-mods
+  install-go-devtools
+  setup-ci
+}
+
+main "$@"

.devcontainer/devcontainer.json

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

.dockerignore

@@ -6,7 +6,9 @@ contrib
 build
 docs
 tests
-!build/dokku.deb
+!build/package/*
+!docs/_build/entrypoint
+!docs/_build/requirements.txt
 !tests/dhparam.pem
 !contrib/bash-completion
 !contrib/docker

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,66 @@
+---
+name: Bug Report
+description: File a bug report
+labels: ["needs: investigation", "type: bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Consider [sponsoring Dokku](https://github.com/sponsors/dokku). Sponsorship goes directly to supporting activities such as fixing bugs and general maintenance.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of problem
+      description: What happened? What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: What are the steps that we need to follow to reproduce this issue?
+    validations:
+      required: true
+  - type: textarea
+    id: report-output
+    attributes:
+      label: dokku report $APP_NAME
+      description: Please paste the output of the command `dokku report $APP_NAME`, where `$APP_NAME` is the name of your app
+    validations:
+      required: true
+  - type: textarea
+    id: additional-output
+    attributes:
+      label: Additional information
+      description: |
+        This information is useful for debugging app issues:
+
+        - Container Inspect Output (if applicable) via `dokku ps:inspect APP_NAME`
+        - The nginx configuration (if applicable) via `dokku nginx:show-config APP_NAME`
+        - Link to the exact repository being deployed (if possible/applicable)
+
+        If a deploy is failing or behaving unexpectedly:
+
+        - Application name
+        - The type of application being deployed (node, php, python, ruby, etc.)
+        - If using buildpacks, which custom buildpacks are in use
+        - If using a Dockerfile, the contents of that file
+        - If it exists, the contents of your Procfile.
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: "Output of failing commands after running: dokku trace:off"
+      render: shell
+    validations:
+      required: false
+  - type: textarea
+    id: trace-logs
+    attributes:
+      label: "Output of failing commands after running: dokku trace:on"
+      description: |
+        **BEWARE**: `dokku trace:on` will cause some commands to print environment variables, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXX
+      render: shell
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/buildpack_issue.yaml

@@ -0,0 +1,71 @@
+---
+name: Buildpack Issue
+description: Is your deploy failing while building your application using buildpacks? Check this out.
+labels: ["upstream: buildpacks"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If your build is stuck downloading something, compiling a file, or seems to always fail around the same area, Github Issues is not a great place to debug. This is because these sorts of issues tend to take a lot of back and forth to figure out, and the code for buildpacks is not generally maintained by the Dokku project.
+
+        <details>
+        <summary>Debugging tips:</summary>
+
+        - If you see text that says `Killed` in your output, attempt to increase free memory by using a larger server or [add swap memory](https://dokku.com/docs/getting-started/troubleshooting/#build-fails-with-killed-message).
+        - Turn on buildpack trace mode via `dokku config:set $APP_NAME BUILDPACK_XTRACE=1` and retry your deploy. Not all buildpacks support this, but many will output extra debugging information.
+        - Your hosting provider may have issues accessing AWS S3. Verify a slow/stalled download works by directly curling the file from your host.
+        - Many buildpacks allow downloading a file from an alternative location specified via environment variable.
+        - [Increase curl timeouts](https://dokku.com/docs/getting-started/troubleshooting/#deployment-fails-because-of-slow-internet-connection-messages-s) if you see gzip download issues.
+        - If using multi-buildpack support but a buildpack is failing to apply, ensure you have any files necessary for the `bin/detect` script of the buildpack to `exit 0`. Selected buildpacks must still pass the detection phase in order to be used.
+        </details>
+
+        If you are still having issues, file a ticket here and then further discussing the ticket in one of our [Monitored Support Channels](https://dokku.com/docs/getting-started/where-to-get-help/#monitored-locations) (Discord, Github Discussions, Slack). Your filed ticket may be closed or locked, but any subsequent discovery will be posted to the ticket for posterity.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of problem
+      description: What happened? What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: report-output
+    attributes:
+      label: dokku report $APP_NAME
+      description: Please paste the output of the command `dokku report $APP_NAME`, where `$APP_NAME` is the name of your app.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-output
+    attributes:
+      label: Additional information
+      description: |
+        This information is useful for debugging app issues:
+
+        - Container Inspect Output (if applicable) via `dokku ps:inspect APP_NAME`
+        - The nginx configuration (if applicable) via `dokku nginx:show-config APP_NAME`
+        - Link to the exact repository being deployed (if possible/applicable)
+
+        If a deploy is failing or behaving unexpectedly:
+
+        - Application name
+        - The type of application being deployed (node, php, python, ruby, etc.)
+        - If using buildpacks, which custom buildpacks are in use
+        - If it exists, the contents of your Procfile.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: "Output of failing deploy after running: dokku trace:off"
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: trace-logs
+    attributes:
+      label: "Output of failing deploy after running: dokku trace:on"
+      description: |
+        **BEWARE**: `dokku trace:on` will cause some commands to print environment variables, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXX
+      render: shell
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,18 @@
+---
+name: Feature Request
+description: Have an idea for a new feature? Ask away!
+labels: ["needs: plan", "type: enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        While pull requests are always welcome, feel free to fill this out with an idea of what you would like to happen and we can discuss if and how it should be implemented in Dokku.
+
+        Consider [sponsoring Dokku](https://github.com/sponsors/dokku). Sponsorship goes directly to supporting activities such as implementing new features and upgrading existing functionality.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of feature
+      description: When you perform what command or action, what do you think should happen?
+    validations:
+      required: true

.github/actions/build-image/action.yml

@@ -0,0 +1,39 @@
+---
+name: 'build-image'
+
+description: 'builds a dokku docker image'
+
+inputs:
+  architecture:
+    description: 'platform to build'
+    required: true
+    default: 'linux/amd64'
+
+runs:
+  using: "composite"
+  steps:
+    - name: download packages
+      uses: actions/download-artifact@v3
+      with:
+        name: build
+        path: build
+
+    - name: set up docker buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: build docker image
+      shell: bash
+      run: |
+        if [[ "${{ inputs.architecture }}" == "linux/arm" ]]; then
+          docker buildx build \
+                --platform linux/arm \
+                --progress plain \
+                --tag "dokku/dokku:latest" \
+                .
+        else
+          docker buildx build \
+                  --progress plain \
+                  --tag "dokku/dokku:latest" \
+                  .
+        fi

.github/commands/ci-setup

@@ -2,19 +2,23 @@
 set -eo pipefail
 set -x
 
+DOKKU_DOMAIN=${DOKKU_DOMAIN:="dokku.me"}
+
 echo "=====> set hostname"
 hostname
 internal_ip="$(ifconfig eth0 | grep 'inet ' | awk '{print $2}')"
-sudo hostname "dokku.me"
-echo "dokku.me" | sudo tee /etc/hostname
+sudo hostname "$DOKKU_DOMAIN"
+echo "$DOKKU_DOMAIN" | sudo tee /etc/hostname
 hostname
 sudo cat /etc/hostname
 
-echo "=====> resolve dokku.me"
+echo "=====> resolve $DOKKU_DOMAIN"
 sudo apt -qq -y --no-install-recommends install net-tools
-# dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
-ifconfig
-sudo ip addr add 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
+if [[ "$DOKKU_DOMAIN" == "dokku.me" ]]; then
+  # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
+  ifconfig
+  sudo ip addr add 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
+fi
 
 echo "=====> install ci-dependencies"
 make ci-dependencies

.github/dependabot.yml

@@ -1,61 +1,209 @@
 ---
 version: 2
 updates:
+  - package-ecosystem: pip
+    directory: "/docs/_build"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/app-json"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/apps"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/builder"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/buildpacks"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/common"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/config"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/cron"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/docker-options"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/logs"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/network"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/nginx-vhosts"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/proxy"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/ps"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/registry"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/repo"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/resource"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: gomod
+    directory: "/plugins/scheduler"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 2
+    labels:
+      - "type: dependencies"
   - package-ecosystem: bundler
     directory: "/tests/apps/ruby"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: bundler
     directory: "/tests/apps/multi"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/checks-root"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/config"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
-    directory: "/tests/apps/dockerfile-dokku-scale"
+    directory: "/tests/apps/dockerfile-app-json-formations"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/dockerfile-noexpose"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/dockerfile-procfile-bad"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/dockerfile-procfile"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/dockerfile"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/gitsubmodules"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: gomod
     directory: "/tests/apps/gogrpc"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
     ignore:
       - dependency-name: google.golang.org/grpc
         versions:
@@ -65,43 +213,173 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: maven
     directory: "/tests/apps/java"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/nodejs-express"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/nodejs-worker"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/nodejs-express-noappjson"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/nodejs-express-noprocfile"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: composer
     directory: "/tests/apps/php"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: pip
     directory: "/tests/apps/python-flask"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
   - package-ecosystem: npm
     directory: "/tests/apps/.websocket.disabled"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-noexpose"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-procfile"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-entrypoint"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-procfile-bad"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/go-fail-predeploy"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/zombies-dockerfile-no-tini"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-release"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/dockerfile-app-json-formations"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/gogrpc"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/zombies-dockerfile-tini"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/tests/apps/go-fail-postdeploy"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/docs/_build"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"
+  - package-ecosystem: "docker"
+    directory: "/.devcontainer"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "type: dependencies"

.github/linters/.markdown-lint.yml

@@ -8,3 +8,30 @@ MD013: false
 # Inline HTML
 # https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md033
 MD033: false
+
+# List indentation
+# 2 spaces breaks list formatting in mkdocs
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md007
+MD007:
+  indent: 4
+
+# Fenced code blocks should have a language specified
+# We use a second, un-languaged code block to denote the output
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md040
+MD040: false
+
+# Blank line inside blockquote
+# This is typically done when a section has a "New as of" or "Warning" in addition to a note
+# May wish to take advantage of github-style admonitions
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md028
+MD028: false
+
+# No duplicate headers
+# HISTORY.md has a ton of these
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md024
+MD024: false
+
+# First line h1
+# The issue template doesn't have one
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md041
+MD041: false

.github/workflows/ci.yml

@@ -10,49 +10,137 @@ on:
     branches:
       - 'master'
 
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  INSTALL_DOCKER_REPO: 1
+
 jobs:
+  check-commit:
+    runs-on: ubuntu-20.04
+    outputs:
+      skip: ${{ steps.check-commit.outputs.skip }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: check if message contain keywords ace scopeid
+        id: check-commit
+        run: |
+          # checking for "docs" or "[ci skip]" messages
+          message=$(git log -1 --pretty=format:'%s')
+          if [[ "$message" =~ "\[(ci skip)\]" ]]; then
+            echo "Skipping tests due to [ci skip] message"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          elif [[ "$message" =~ "^docs:" ]]; then
+            echo "Skipping tests due to "docs:" prefix on message"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          fi
+
   build:
     name: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    needs: check-commit
+    if: ${{ needs.check-commit.outputs.skip != 'true' }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     strategy:
       fail-fast: true
+    timeout-minutes: 45
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: build package
         run: ./tests/ci/setup.sh build
+        env:
+          SKIP_IMAGE_BUILD: true
 
       - name: set matrix for build
         id: set-matrix
         run: |
           json=$(python .github/commands/matrix)
           echo $json
-          echo "::set-output name=matrix::$(echo "$json")"
+          echo "matrix=$json" >> $GITHUB_OUTPUT
 
       - name: upload packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build
           path: build
 
+  build-image-amd64:
+    name: build-image.linux/amd64
+    needs: build
+    runs-on: ubuntu-20.04
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: build-image
+        uses: ./.github/actions/build-image
+        with:
+          architecture: linux/amd64
+
+  build-image-arm:
+    name: build-image.linux/arm
+    needs: build
+    runs-on: buildjet-4vcpu-ubuntu-2204-arm
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: build-image
+        uses: ./.github/actions/build-image
+        with:
+          architecture: linux/arm
+
+  build-image-arm64:
+    name: build-image.linux/arm64
+    needs: build
+    runs-on: buildjet-4vcpu-ubuntu-2204-arm
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: build-image
+        uses: ./.github/actions/build-image
+        with:
+          architecture: linux/arm64
+
   unit-tests:
     name: unit.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.build.outputs.matrix)}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: download packages
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: build
+          path: build
 
       - name: ci-setup
         run: ./.github/commands/ci-setup
@@ -61,7 +149,7 @@ jobs:
       #   uses: luchihoratiu/debug-via-ssh@main
       #   with:
       #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-      #     SSH_PASS: ${{ secrets.SSH_PASS }}
+      #     SSH_PASS: ${{ secrets.NGROK_SSH_PASS }}
 
       - name: run ci
         timeout-minutes: 30
@@ -72,7 +160,7 @@ jobs:
           SYNC_GITHUB_PASSWORD: ${{ secrets.SYNC_GITHUB_PASSWORD }}
           SYNC_GITHUB_USERNAME: ${{ secrets.SYNC_GITHUB_USERNAME }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: test-results-${{ matrix.index }}
           path: test-results
@@ -80,17 +168,18 @@ jobs:
   docker-deploy-tests:
     name: docker
     needs: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: download packages
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: build
+          path: build
 
       - name: ci-setup
         run: ./.github/commands/ci-setup
@@ -105,7 +194,7 @@ jobs:
   go-tests:
     name: go.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -114,12 +203,13 @@ jobs:
       GITHUB_NODE_INDEX: ${{ matrix.index }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: download packages
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: build
+          path: build
 
       - name: ci-setup
         run: ./.github/commands/ci-setup
@@ -137,7 +227,7 @@ jobs:
             2) sudo -E make -e deploy-test-multi ;;
             3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
           esac
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: coverage.${{ matrix.index }}
           path: test-results/coverage
@@ -145,20 +235,22 @@ jobs:
   publish-test-results:
     name: publish-test-results
     needs: unit-tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    permissions:
+      checks: write
     # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: download test-results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: test-results
 
       - name: Publish Unit Test Results
-        uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1
+        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: Unit Test Results
-          github_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          files: test-results/**/*.xml
-          comment_on_pr: false
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          junit_files: test-results/**/*.xml
+          comment_mode: "off"

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/docs.yml

@@ -0,0 +1,39 @@
+---
+name: 'docs'
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cloning repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: "Setup python 3.10"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Generate documentation
+        env:
+          BOT_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          BOT_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+        run: |
+          git config --global user.name 'Dokku Bot'
+          git config --global user.email no-reply@dokku.com
+
+          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+          sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
+          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+          sudo apt update
+          sudo apt install gh -y
+
+          gh auth login --with-token <<<"$BOT_GITHUB_API_TOKEN"
+          contrib/build-docs

.github/workflows/lint.yml

@@ -16,46 +16,72 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Run hadolint
-        uses: hadolint/hadolint-action@d7b38582334d9ac11c12021c16f21d63015fa250
-        # v1.6.0 => d7b38582334d9ac11c12021c16f21d63015fa250
+        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        # v3.0.0 => 4b5806eb9c6bee4954fc0e0cc3ad6175fc9782c1
 
   markdown-lint:
     name: markdown-lint
     runs-on: ubuntu-20.04
     steps:
       - name: Clone
-        uses: actions/checkout@v2
-      - name: Run markdown-lint
-        uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb
-        # v1.5.0 => 04d43ee9191307b50935a753da3b775ab695eceb
+        uses: actions/checkout@v3
+      - name: Setup node
+        uses: actions/setup-node@v3
         with:
-          config: '.github/linters/.markdown-lint.yml'
-          args: './README.md'
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: '.github/workflows/lint.yml'
+      - name: Install markdownlint-cli
+        run: npm install -g markdownlint-cli@0.35.0
+      - name: Run markdown-lint
+        run: markdownlint -c .github/linters/.markdown-lint.yml *.md **/*.md
+
+  packer:
+    name: packer
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup packer
+        uses: hashicorp/setup-packer@main
+        with:
+          version: latest
+      - name: Run packer init
+        run: "make image/init/digitalocean"
+        env:
+          PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get changed files in the docs folder
+        id: changed-files-specific
+        uses: tj-actions/changed-files@v38.1.0
+        with:
+          files: contrib/images/digitalocean/**
+      - name: Run `packer validate`
+        env:
+          DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
+        if: steps.changed-files-specific.outputs.any_changed == 'true'
+        run: "make image/validate/digitalocean"
 
   shellcheck:
     name: shellcheck
     runs-on: ubuntu-20.04
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Run shellcheck
-        uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
+        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38
         # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
-        env:
-          # keep in sync with tests/shellcheck-exclude
-          SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267 -e SC2295
 
   shfmt:
     name: shfmt
     runs-on: ubuntu-20.04
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Run shfmt
-        uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
-        # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
+        uses: luizm/action-sh-checker@76ab0b22e1f194e4a582edc7969df6485c4e9246
+        # v0.5.0 => edd0e45ecff35b05f162052b50df50976c1b74fc
         env:
           SHFMT_OPTS: -l -bn -ci -i 2 -d
         with:
@@ -66,9 +92,9 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
-        # v3.0.4 => ed2b6e911569708ed121c14b87d513860a7e36a7
+        uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c
+        # v3.1.1 => 2576378a8e339169678f9939646ee3ee325e845c
         with:
           config_file: '.github/linters/.yamllint.yml'

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -27,12 +27,27 @@ jobs:
         with:
           ruby-version: 2.6
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
+      - name: login to docker hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+
       - name: install package_cloud
         run: gem install package_cloud
 
@@ -42,25 +57,64 @@ jobs:
           git config --global user.email no-reply@dokku.com
 
       - name: build package
+        env:
+          RELEASE_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          RELEASE_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
         run: contrib/release-dokku ${{ github.event.inputs.release_type }}
 
       - name: output version
         id: version
-        run: echo "::set-output name=version::$(cat build/next-version)"
+        run: echo "version=$(cat build/next-version)" >> $GITHUB_OUTPUT
 
       - name: upload packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build
           path: build
 
+  build-digitalocean:
+    name: build-digitalocean
+    runs-on: ubuntu-20.04
+    needs: release
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup packer
+        uses: hashicorp/setup-packer@main
+        with:
+          version: latest
+
+      - name: Run packer init
+        run: "make image/init/digitalocean"
+
+      - name: Run `packer validate`
+        env:
+          DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
+        run: |
+          VERSION=${{ needs.release.outputs.version }}
+          PKR_VAR_dokku_version="${VERSION:1}" make image/validate/digitalocean
+
+      - name: Bump Digitalocean Image
+        env:
+          DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
+        run: |
+          VERSION=${{ needs.release.outputs.version }}
+          PKR_VAR_dokku_version="${VERSION:1}" make image/build/digitalocean
+
+      - name: upload packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: digitalocean-manifest.json
+          path: digitalocean-manifest.json
+
   bump-azure:
     name: bump-azure
     runs-on: ubuntu-20.04
     needs: release
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bump Azure Template
         env:
           BOT_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}

.gitignore

@@ -11,3 +11,4 @@ test-results/
 stack.tgz
 tmp
 coverage.out
+site

.shellcheckrc

@@ -16,7 +16,7 @@
 # SC2128 - Expanding an array without an index only gives the first element - https://github.com/koalaman/shellcheck/wiki/SC2128
 # SC2148 - Tips depend on target shell and yours is unknown. Add a shebang - https://github.com/koalaman/shellcheck/wiki/SC2148
 # SC2153 - Possible misspelling: DOKKU_ROOT may not be assigned, but DOKKU_PORT is - https://github.com/koalaman/shellcheck/wiki/SC2153
-# SC2154 - passed_docker_option is referenced but not assigned - https://github.com/koalaman/shellcheck/wiki/SC2154
+# SC2154 - Var is referenced but not assigned - https://github.com/koalaman/shellcheck/wiki/SC2154
 # SC2155 - Declare and assign separately to avoid masking return values - https://github.com/koalaman/shellcheck/wiki/SC2155
 # SC2162 - read without -r will mangle backslashes - https://github.com/koalaman/shellcheck/wiki/SC2162
 # SC2174 - When used with -p, -m only applies to the deepest directory - https://github.com/koalaman/shellcheck/wiki/SC2174
@@ -30,3 +30,4 @@
 # SC2235 - Use { ..; } instead of (..) to avoid subshell overhead - https://github.com/koalaman/shellcheck/wiki/SC2235
 # SC2267 - GNU xargs -i is deprecated in favor of -I{} - https://github.com/koalaman/shellcheck/wiki/SC2267
 # SC2295 - Expansions inside ${..} need to be quoted separately, otherwise they match as patterns - https://github.com/koalaman/shellcheck/wiki/SC2295
+disable=SC1001,SC1003,SC1090,SC1091,SC1117,SC2029,SC2030,SC2031,SC2034,SC2046,SC2064,SC2068,SC2086,SC2119,SC2120,SC2128,SC2148,SC2153,SC2154,SC2155,SC2162,SC2174,SC2179,SC2191,SC2199,SC2207,SC2219,SC2220,SC2231,SC2235,SC2267,SC2295

.stickler.yml

@@ -1,13 +0,0 @@
----
-linters:
-  shellcheck:
-    shell: bash
-    exclude: SC2034,SC1090,SC2191
-  golint:
-
-files:
-  ignore:
-    - 'debian/*'
-    - 'docs/*'
-    - 'tests/*'
-    - '*/vendor/*'

CONTRIBUTING.md

@@ -19,11 +19,11 @@ a chance of keeping on top of things.
 - [Reporting Security Issues](#reporting-security-issues)
 - [Reporting Issues](#reporting-other-issues)
 - [Contributing](#contributing)
-  - [Making Changes](#making-changes)
-  - [Which branch to base the work](#which-branch-to-base-the-work)
-  - [Submitting Changes](#submitting-changes)
-  - [When will my change be merged?](#when-will-my-change-be-merged)
-  - [Running tests locally](#running-tests-locally)
+    - [Making Changes](#making-changes)
+    - [Which branch to base the work](#which-branch-to-base-the-work)
+    - [Submitting Changes](#submitting-changes)
+    - [When will my change be merged?](#when-will-my-change-be-merged)
+    - [Running tests locally](#running-tests-locally)
 - [Additional Resources](#additional-resources)
 
 ## Reporting security issues
@@ -65,24 +65,24 @@ need to do
 
 - Make sure you have a [GitHub account](https://github.com/signup/free).
 - Submit an [issue](https://github.com/dokku/dokku/issues), assuming one does not already exist.
-  - Clearly describe the issue including steps to reproduce when it is a bug.
-  - Make sure you fill in the earliest version that you know has the issue.
+    - Clearly describe the issue including steps to reproduce when it is a bug.
+    - Make sure you fill in the earliest version that you know has the issue.
 - Fork the repository on GitHub.
 
 ### Making Changes
 
 - Create a topic branch from where you want to base your work.
-  - This is usually the master branch.
-  - Only target an existing branch if you are certain your fix must be on that
-    branch.
-  - To quickly create a topic branch based on master; `git checkout -b my_contribution origin/master`.
-    It is best to avoid working directly on the `master` branch. Doing so will
+    - This is usually the master branch.
+    - Only target an existing branch if you are certain your fix must be on that
+      branch.
+    - To quickly create a topic branch based on master; `git checkout -b my_contribution origin/master`.
+      It is best to avoid working directly on the `master` branch. Doing so will
     help avoid conflicts if you pull in updates from origin.
 - Make commits of logical units. Implementing a new function and calling it in
   another file constitute a single logical unit of work.
-  - Before you make a pull request, squash your commits into logical units of work
-    using `git rebase -i` and `git push -f`.
-  - A majority of submissions should have a single commit, so if in doubt,
+    - Before you make a pull request, squash your commits into logical units of work
+      using `git rebase -i` and `git push -f`.
+    - A majority of submissions should have a single commit, so if in doubt,
     squash your commits down to one commit.
 - Check for unnecessary whitespace with `git diff --check` before committing.
 - Use descriptive commit messages and reference the #issue number.
@@ -92,7 +92,7 @@ need to do
 - Your work should apply the [Dokku coding standards](https://github.com/progrium/bashstyle)
 - Pull requests must be cleanly rebased on top of master without multiple branches
   mixed into the PR.
-  - **Git tip**: If your PR no longer merges cleanly, use `rebase master` in your
+    - **Git tip**: If your PR no longer merges cleanly, use `rebase master` in your
     feature branch to update your pull request rather than `merge master`.
 
 ### Which branch to base the work
@@ -135,4 +135,4 @@ which contains test setup information as well as tips for running tests.
 - [Existing issues](https://github.com/dokku/dokku/issues)
 - [General GitHub documentation](https://help.github.com/)
 - [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
-- [Gliderlabs Slack in the #dokku channel](https://glider-slackin.herokuapp.com/)
+- [Gliderlabs Slack in the #dokku channel](https://slack.dokku.com/)

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/baseimage:bionic-1.0.0
+FROM phusion/baseimage:focal-1.2.0
 
 CMD ["/sbin/my_init"]
 
@@ -14,23 +14,29 @@ RUN addgroup --gid $DOKKU_GID dokku \
   && adduser --uid $DOKKU_UID --gid $DOKKU_GID --disabled-password --gecos "" "dokku"
 
 COPY ./tests/dhparam.pem /tmp/dhparam.pem
-COPY ./build/dokku.deb /tmp/dokku.deb
+COPY ./build/package/ /tmp
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3005,DL3008
-RUN echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \
+RUN mkdir -p /etc/apt/keyrings \
+  && mkdir -p /etc/apt/keyrings \
+  && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
+  && apt-get update \
+  && apt-get -y --no-install-recommends install docker-ce docker-ce-cli containerd.io docker-compose-plugin \
+  && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \
   && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | debconf-set-selections \
   && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | debconf-set-selections \
   && curl -sSL https://packagecloud.io/dokku/dokku/gpgkey | apt-key add - \
-  && echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ bionic main" | tee /etc/apt/sources.list.d/dokku.list \
+  && echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ focal main" | tee /etc/apt/sources.list.d/dokku.list \
   && mkdir -p /etc/nginx/ \
   && cp /tmp/dhparam.pem /etc/nginx/dhparam.pem \
-  && apt-get update -qq \
-  && apt-get upgrade -qq -y \
-  && apt-get -qq -y --no-install-recommends --only-upgrade install openssl openssh-server \
-  && apt-get -qq -y --no-install-recommends install rsync /tmp/dokku.deb \
-  && apt-get purge -qq -y syslog-ng-core \
-  && apt-get autoremove -qq -y \
+  && apt-get update \
+  && apt-get upgrade -y \
+  && apt-get -y --no-install-recommends --only-upgrade install openssl openssh-server \
+  && apt-get -y --no-install-recommends install rsync "/tmp/dokku-$(dpkg --print-architecture).deb" \
+  && apt-get purge -y syslog-ng-core \
+  && apt-get autoremove -y \
   && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /tmp
@@ -51,6 +57,7 @@ RUN \
   && ln -sf /mnt/dokku/home/dokku /home/dokku \
   && ln -sf /mnt/dokku/var/lib/dokku/config /var/lib/dokku/config \
   && ln -sf /mnt/dokku/var/lib/dokku/data /var/lib/dokku/data \
+  && ln -sf /mnt/dokku/var/lib/dokku/services /var/lib/dokku/services \
   && mv /etc/my_init.d/00_regen_ssh_host_keys.sh /etc/my_init.d/15_regen_ssh_host_keys \
   && rm -f /etc/nginx/sites-enabled/default /usr/share/nginx/html/index.html /etc/my_init.d/10_syslog-ng.init \
   && rm -f /usr/local/openresty/nginx/conf/sites-enabled/default /usr/share/openresty/html/index.html \

ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@
 >
 > If you'd like to sponsor specific functionality, see the project's [Sponsoring](https://github.com/dokku/.github/blob/master/SPONSORING.md) document.
 >
-> If you need help figuring out how to use a specific buildpack, are seeing an issue in during the buildpack process, or are having issues using multiple buildpacks, please see our [slack channels or github discussion board](https://dokku.com/docs/getting-started/where-to-get-help/#monitored-locations). Issues pertaining to buildpacks may be closed and locked.
+> If you need help figuring out how to use a specific buildpack, are seeing an issue in during the buildpack process, or are having issues using multiple buildpacks, please see our [chat channels or github discussion board](https://dokku.com/docs/getting-started/where-to-get-help/#monitored-locations). Issues pertaining to buildpacks may be closed and locked.
 >
 > If you need support for a version of Dokku that is more than a year old, your issue may be closed without an answer. Please upgrade to a recent version.
 
@@ -31,7 +31,7 @@
 > For problems affecting all applications, the report output for a broken application is useful for our debugging.
 > In these cases, you may run `dokku report` without any arguments to display the top-level reporting information.
 
-### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?
+### How (deb/make) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?
 
 ### Additional information
 
@@ -39,10 +39,10 @@
 - The nginx configuration (if applicable) via `dokku nginx:show-config APP_NAME`
 - Link to the exact repository being deployed (if possible/applicable):
 - If a deploy is failing or behaving unexpectedly:
-  - Application name
-  - The type of application being deployed (node, php, python, ruby, etc.)
-  - If using buildpacks, which custom buildpacks are in use
-  - If using a `Dockerfile`, the contents of that file
-  - If it exists, the contents of your `Procfile`.
+    - Application name
+    - The type of application being deployed (node, php, python, ruby, etc.)
+    - If using buildpacks, which custom buildpacks are in use
+    - If using a `Dockerfile`, the contents of that file
+    - If it exists, the contents of your `Procfile`.
 - Output of failing Dokku commands after running `dokku trace:on`
   (BEWARE: `trace:on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXX):

Makefile

@@ -1,20 +1,26 @@
 DOKKU_VERSION ?= master
 
-DOCKER_IMAGE_LABELER_VERSION ?= 0.2.2
-HEROKUISH_VERSION ?= 0.5.25
-NETRC_VERSION ?= 0.3.0
-PLUGN_VERSION ?= 0.6.1
-PROCFILE_VERSION ?= 0.11.0
-SIGIL_VERSION ?= 0.6.0
-SSHCOMMAND_VERSION ?= 0.12.0
-DOCKER_IMAGE_LABELER_URL ?= https://github.com/dokku/docker-image-labeler/releases/download/v${DOCKER_IMAGE_LABELER_VERSION}/docker-image-labeler_${DOCKER_IMAGE_LABELER_VERSION}_linux_x86_64.tgz
-NETRC_URL ?= https://github.com/dokku/netrc/releases/download/v${NETRC_VERSION}/netrc_${NETRC_VERSION}_linux_x86_64.tgz
-PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v${PLUGN_VERSION}/plugn_${PLUGN_VERSION}_linux_x86_64.tgz
-PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v${PROCFILE_VERSION}/procfile-util_${PROCFILE_VERSION}_linux_x86_64.tgz
-SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/sigil_${SIGIL_VERSION}_Linux_x86_64.tgz
+TARGETARCH ?= amd64
+
+DOCKER_IMAGE_LABELER_VERSION ?= 0.6.1
+DOCKER_CONTAINER_HEALTHCHECKER_VERSION ?= 0.6.4
+HEROKUISH_VERSION ?= 0.7.1
+LAMBDA_BUILDER_VERSION ?= 0.5.0
+NETRC_VERSION ?= 0.7.1
+PLUGN_VERSION ?= 0.12.0
+PROCFILE_VERSION ?= 0.16.0
+SIGIL_VERSION ?= 0.10.1
+SSHCOMMAND_VERSION ?= 0.17.1
+DOCKER_IMAGE_LABELER_URL ?= https://github.com/dokku/docker-image-labeler/releases/download/v${DOCKER_IMAGE_LABELER_VERSION}/docker-image-labeler_${DOCKER_IMAGE_LABELER_VERSION}_linux_${TARGETARCH}.tgz
+DOCKER_CONTAINER_HEALTHCHECKER_URL ?= https://github.com/dokku/docker-container-healthchecker/releases/download/v${DOCKER_CONTAINER_HEALTHCHECKER_VERSION}/docker-container-healthchecker_${DOCKER_CONTAINER_HEALTHCHECKER_VERSION}_linux_${TARGETARCH}.tgz
+LAMBDA_BUILDER_URL ?= https://github.com/dokku/lambda-builder/releases/download/v${LAMBDA_BUILDER_VERSION}/lambda-builder_${LAMBDA_BUILDER_VERSION}_linux_${TARGETARCH}.tgz
+NETRC_URL ?= https://github.com/dokku/netrc/releases/download/v${NETRC_VERSION}/netrc_${NETRC_VERSION}_linux_${TARGETARCH}.tgz
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v${PLUGN_VERSION}/plugn_${PLUGN_VERSION}_linux_${TARGETARCH}.tgz
+PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v${PROCFILE_VERSION}/procfile-util_${PROCFILE_VERSION}_linux_${TARGETARCH}.tgz
+SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_linux_${TARGETARCH}.tgz
 SSHCOMMAND_URL ?= https://github.com/dokku/sshcommand/releases/download/v${SSHCOMMAND_VERSION}/sshcommand_${SSHCOMMAND_VERSION}_linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
-PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest-20
+PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest-22
 DOKKU_LIB_ROOT ?= /var/lib/dokku
 PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins
 CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins
@@ -36,12 +42,12 @@ endif
 
 include common.mk
 
-.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies docker-image-labeler netrc sshcommand procfile-util plugn docker aufs stack count vagrant-acl-add vagrant-dokku go-build
+.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies docker-image-labeler lambda-builder netrc sshcommand procfile-util plugn docker aufs stack count vagrant-acl-add vagrant-dokku go-build
 
+include docs.mk
 include tests.mk
 include package.mk
 include deb.mk
-include rpm.mk
 include arch.mk
 
 all:
@@ -131,7 +137,7 @@ plugin-dependencies: plugn procfile-util
 plugins: plugn procfile-util docker
 	sudo -E dokku plugin:install --core
 
-dependencies: apt-update docker-image-labeler netrc sshcommand plugn procfile-util docker help2man man-db sigil dos2unix jq parallel
+dependencies: apt-update docker-image-labeler docker-container-healthchecker lambda-builder netrc sshcommand plugn procfile-util docker help2man man-db sigil dos2unix jq parallel
 	$(MAKE) -e stack
 
 apt-update:
@@ -155,22 +161,37 @@ man-db:
 docker-image-labeler:
 	wget -qO /tmp/docker-image-labeler_latest.tgz ${DOCKER_IMAGE_LABELER_URL}
 	tar xzf /tmp/docker-image-labeler_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/docker-image-labeler-${TARGETARCH} /usr/local/bin/docker-image-labeler
+
+docker-container-healthchecker:
+	wget -qO /tmp/docker-container-healthchecker_latest.tgz ${DOCKER_CONTAINER_HEALTHCHECKER_URL}
+	tar xzf /tmp/docker-container-healthchecker_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/docker-container-healthchecker-${TARGETARCH} /usr/local/bin/docker-container-healthchecker
+
+lambda-builder:
+	wget -qO /tmp/lambda-builder_latest.tgz ${LAMBDA_BUILDER_URL}
+	tar xzf /tmp/lambda-builder_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/lambda-builder-${TARGETARCH} /usr/local/bin/lambda-builder
 
 netrc:
 	wget -qO /tmp/netrc_latest.tgz ${NETRC_URL}
 	tar xzf /tmp/netrc_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/netrc-${TARGETARCH} /usr/local/bin/netrc
 
 procfile-util:
 	wget -qO /tmp/procfile-util_latest.tgz ${PROCFILE_UTIL_URL}
 	tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/procfile-util-${TARGETARCH} /usr/local/bin/procfile-util
 
 plugn:
 	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
 	tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/plugn-${TARGETARCH} /usr/local/bin/plugn
 
 sigil:
 	wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
 	tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
+	mv /usr/local/bin/gliderlabs-sigil-${TARGETARCH} /usr/local/bin/sigil
 
 sshcommand:
 	wget -qO /tmp/sshcommand_latest.tgz ${SSHCOMMAND_URL}

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://github.com/dokku/dokku/workflows/CI/badge.svg)](https://github.com/dokku/dokku/actions?query=workflow%3ACI)
 [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku)
 [![Arch Package](https://img.shields.io/badge/package-arch-brightgreen.svg?style=flat-square "Arch Package")](https://aur.archlinux.org/packages/dokku/)
-[![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://glider-slackin.herokuapp.com/)
+[![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://slack.dokku.com/)
 [![Documentation](https://img.shields.io/badge/docs-site-blue.svg?style=flat-square "Site")](https://dokku.com/docs/getting-started/installation/)
 [![OpenCollective](https://opencollective.com/dokku/sponsors/badge.svg?style=flat-square)](#sponsors)
 [![OpenCollective](https://opencollective.com/dokku/backers/badge.svg?style=flat-square)](#backers)
@@ -15,79 +15,67 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 
 Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor](https://opencollective.com/dokku#sponsor)]
 
-<a href="https://opencollective.com/dokku/sponsor/0/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/1/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/2/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/3/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/4/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/5/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/6/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/7/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/8/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/9/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/10/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/11/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/12/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/12/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/13/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/13/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/14/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/14/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/15/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/15/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/16/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/16/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/17/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/17/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/18/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/18/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/19/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/19/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/20/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/20/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/21/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/21/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/22/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/22/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/23/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/23/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/24/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/24/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/25/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/25/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/26/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/26/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/27/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/27/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/28/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/sponsor/29/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/29/avatar.svg"></a>
+[![OpenCollective Sponsor 0](https://opencollective.com/dokku/sponsor/0/avatar.svg)](https://opencollective.com/dokku/sponsor/0/website)
+[![OpenCollective Sponsor 1](https://opencollective.com/dokku/sponsor/1/avatar.svg)](https://opencollective.com/dokku/sponsor/1/website)
+[![OpenCollective Sponsor 2](https://opencollective.com/dokku/sponsor/2/avatar.svg)](https://opencollective.com/dokku/sponsor/2/website)
+[![OpenCollective Sponsor 3](https://opencollective.com/dokku/sponsor/3/avatar.svg)](https://opencollective.com/dokku/sponsor/3/website)
+[![OpenCollective Sponsor 4](https://opencollective.com/dokku/sponsor/4/avatar.svg)](https://opencollective.com/dokku/sponsor/4/website)
+[![OpenCollective Sponsor 5](https://opencollective.com/dokku/sponsor/5/avatar.svg)](https://opencollective.com/dokku/sponsor/5/website)
+[![OpenCollective Sponsor 6](https://opencollective.com/dokku/sponsor/6/avatar.svg)](https://opencollective.com/dokku/sponsor/6/website)
+[![OpenCollective Sponsor 7](https://opencollective.com/dokku/sponsor/7/avatar.svg)](https://opencollective.com/dokku/sponsor/7/website)
+[![OpenCollective Sponsor 8](https://opencollective.com/dokku/sponsor/8/avatar.svg)](https://opencollective.com/dokku/sponsor/8/website)
+[![OpenCollective Sponsor 9](https://opencollective.com/dokku/sponsor/9/avatar.svg)](https://opencollective.com/dokku/sponsor/9/website)
+[![OpenCollective Sponsor 10](https://opencollective.com/dokku/sponsor/10/avatar.svg)](https://opencollective.com/dokku/sponsor/10/website)
+[![OpenCollective Sponsor 11](https://opencollective.com/dokku/sponsor/11/avatar.svg)](https://opencollective.com/dokku/sponsor/11/website)
+[![OpenCollective Sponsor 12](https://opencollective.com/dokku/sponsor/12/avatar.svg)](https://opencollective.com/dokku/sponsor/12/website)
+[![OpenCollective Sponsor 13](https://opencollective.com/dokku/sponsor/13/avatar.svg)](https://opencollective.com/dokku/sponsor/13/website)
+[![OpenCollective Sponsor 14](https://opencollective.com/dokku/sponsor/14/avatar.svg)](https://opencollective.com/dokku/sponsor/14/website)
+[![OpenCollective Sponsor 15](https://opencollective.com/dokku/sponsor/15/avatar.svg)](https://opencollective.com/dokku/sponsor/5/website)
+[![OpenCollective Sponsor 6](https://opencollective.com/dokku/sponsor/16/avatar.svg)](https://opencollective.com/dokku/sponsor/16/website)
+[![OpenCollective Sponsor 17](https://opencollective.com/dokku/sponsor/17/avatar.svg)](https://opencollective.com/dokku/sponsor/17/website)
+[![OpenCollective Sponsor 18](https://opencollective.com/dokku/sponsor/18/avatar.svg)](https://opencollective.com/dokku/sponsor/18/website)
 
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/dokku#backer)]
 
-<a href="https://opencollective.com/dokku/backer/0/website" target="_blank"><img src="https://opencollective.com/dokku/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/1/website" target="_blank"><img src="https://opencollective.com/dokku/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/2/website" target="_blank"><img src="https://opencollective.com/dokku/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/3/website" target="_blank"><img src="https://opencollective.com/dokku/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/4/website" target="_blank"><img src="https://opencollective.com/dokku/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/5/website" target="_blank"><img src="https://opencollective.com/dokku/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/6/website" target="_blank"><img src="https://opencollective.com/dokku/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/7/website" target="_blank"><img src="https://opencollective.com/dokku/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/8/website" target="_blank"><img src="https://opencollective.com/dokku/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/9/website" target="_blank"><img src="https://opencollective.com/dokku/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/10/website" target="_blank"><img src="https://opencollective.com/dokku/backer/10/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/11/website" target="_blank"><img src="https://opencollective.com/dokku/backer/11/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/12/website" target="_blank"><img src="https://opencollective.com/dokku/backer/12/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/13/website" target="_blank"><img src="https://opencollective.com/dokku/backer/13/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/14/website" target="_blank"><img src="https://opencollective.com/dokku/backer/14/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/15/website" target="_blank"><img src="https://opencollective.com/dokku/backer/15/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/16/website" target="_blank"><img src="https://opencollective.com/dokku/backer/16/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/17/website" target="_blank"><img src="https://opencollective.com/dokku/backer/17/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/18/website" target="_blank"><img src="https://opencollective.com/dokku/backer/18/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/19/website" target="_blank"><img src="https://opencollective.com/dokku/backer/19/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/20/website" target="_blank"><img src="https://opencollective.com/dokku/backer/20/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/21/website" target="_blank"><img src="https://opencollective.com/dokku/backer/21/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/22/website" target="_blank"><img src="https://opencollective.com/dokku/backer/22/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/23/website" target="_blank"><img src="https://opencollective.com/dokku/backer/23/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/24/website" target="_blank"><img src="https://opencollective.com/dokku/backer/24/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/25/website" target="_blank"><img src="https://opencollective.com/dokku/backer/25/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/26/website" target="_blank"><img src="https://opencollective.com/dokku/backer/26/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/27/website" target="_blank"><img src="https://opencollective.com/dokku/backer/27/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/28/website" target="_blank"><img src="https://opencollective.com/dokku/backer/28/avatar.svg"></a>
-<a href="https://opencollective.com/dokku/backer/29/website" target="_blank"><img src="https://opencollective.com/dokku/backer/29/avatar.svg"></a>
+[![OpenCollective Backer 0](https://opencollective.com/dokku/backer/0/avatar.svg)](https://opencollective.com/dokku/backer/0/website)
+[![OpenCollective Backer 1](https://opencollective.com/dokku/backer/1/avatar.svg)](https://opencollective.com/dokku/backer/1/website)
+[![OpenCollective Backer 2](https://opencollective.com/dokku/backer/2/avatar.svg)](https://opencollective.com/dokku/backer/2/website)
+[![OpenCollective Backer 3](https://opencollective.com/dokku/backer/3/avatar.svg)](https://opencollective.com/dokku/backer/3/website)
+[![OpenCollective Backer 4](https://opencollective.com/dokku/backer/4/avatar.svg)](https://opencollective.com/dokku/backer/4/website)
+[![OpenCollective Backer 5](https://opencollective.com/dokku/backer/5/avatar.svg)](https://opencollective.com/dokku/backer/5/website)
+[![OpenCollective Backer 6](https://opencollective.com/dokku/backer/6/avatar.svg)](https://opencollective.com/dokku/backer/6/website)
+[![OpenCollective Backer 7](https://opencollective.com/dokku/backer/7/avatar.svg)](https://opencollective.com/dokku/backer/7/website)
+[![OpenCollective Backer 8](https://opencollective.com/dokku/backer/8/avatar.svg)](https://opencollective.com/dokku/backer/8/website)
+[![OpenCollective Backer 9](https://opencollective.com/dokku/backer/9/avatar.svg)](https://opencollective.com/dokku/backer/9/website)
+[![OpenCollective Backer 10](https://opencollective.com/dokku/backer/10/avatar.svg)](https://opencollective.com/dokku/backer/10/website)
+[![OpenCollective Backer 11](https://opencollective.com/dokku/backer/11/avatar.svg)](https://opencollective.com/dokku/backer/11/website)
+[![OpenCollective Backer 12](https://opencollective.com/dokku/backer/12/avatar.svg)](https://opencollective.com/dokku/backer/12/website)
+[![OpenCollective Backer 13](https://opencollective.com/dokku/backer/13/avatar.svg)](https://opencollective.com/dokku/backer/13/website)
+[![OpenCollective Backer 14](https://opencollective.com/dokku/backer/14/avatar.svg)](https://opencollective.com/dokku/backer/14/website)
+[![OpenCollective Backer 15](https://opencollective.com/dokku/backer/15/avatar.svg)](https://opencollective.com/dokku/backer/15/website)
+[![OpenCollective Backer 16](https://opencollective.com/dokku/backer/16/avatar.svg)](https://opencollective.com/dokku/backer/16/website)
+[![OpenCollective Backer 17](https://opencollective.com/dokku/backer/17/avatar.svg)](https://opencollective.com/dokku/backer/17/website)
+[![OpenCollective Backer 18](https://opencollective.com/dokku/backer/18/avatar.svg)](https://opencollective.com/dokku/backer/18/website)
+[![OpenCollective Backer 19](https://opencollective.com/dokku/backer/19/avatar.svg)](https://opencollective.com/dokku/backer/19/website)
+[![OpenCollective Backer 20](https://opencollective.com/dokku/backer/20/avatar.svg)](https://opencollective.com/dokku/backer/20/website)
+[![OpenCollective Backer 21](https://opencollective.com/dokku/backer/21/avatar.svg)](https://opencollective.com/dokku/backer/21/website)
+[![OpenCollective Backer 22](https://opencollective.com/dokku/backer/22/avatar.svg)](https://opencollective.com/dokku/backer/22/website)
+[![OpenCollective Backer 23](https://opencollective.com/dokku/backer/23/avatar.svg)](https://opencollective.com/dokku/backer/23/website)
+[![OpenCollective Backer 24](https://opencollective.com/dokku/backer/24/avatar.svg)](https://opencollective.com/dokku/backer/24/website)
+[![OpenCollective Backer 25](https://opencollective.com/dokku/backer/25/avatar.svg)](https://opencollective.com/dokku/backer/25/website)
+[![OpenCollective Backer 26](https://opencollective.com/dokku/backer/26/avatar.svg)](https://opencollective.com/dokku/backer/26/website)
+[![OpenCollective Backer 27](https://opencollective.com/dokku/backer/27/avatar.svg)](https://opencollective.com/dokku/backer/27/website)
+[![OpenCollective Backer 28](https://opencollective.com/dokku/backer/28/avatar.svg)](https://opencollective.com/dokku/backer/28/website)
+[![OpenCollective Backer 29](https://opencollective.com/dokku/backer/29/avatar.svg)](https://opencollective.com/dokku/backer/29/website)
 
 ## Requirements
 
 A fresh VM running any of the following operating systems:
 
-- Ubuntu 18.04/20.04 x64 - Any currently supported release
-- Debian 9+ x64
-- CentOS 7 x64 *(experimental)*
+- Ubuntu 20.04 / 22.04 x64 - Any currently supported release
+- Debian 10+ x64
 - Arch Linux x64 *(experimental)*
 
 An SSH keypair that can be used for application deployment. If this exists before installation, it will be automatically imported into dokku.
@@ -98,8 +86,8 @@ Otherwise, you will need to import the keypair manually after installation using
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.26.8/bootstrap.sh
-sudo DOKKU_TAG=v0.26.8 bash bootstrap.sh
+wget -NP . https://dokku.com/install/v0.31.2/bootstrap.sh
+sudo DOKKU_TAG=v0.31.2 bash bootstrap.sh
 ```
 
 You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.
@@ -112,15 +100,15 @@ If you wish for a more unattended installation method, see [these](https://dokku
 
 ## Documentation
 
-Full documentation - including advanced installation docs - are available online at [https://dokku.com/docs/getting-started/installation/](https://dokku.com/docs/getting-started/installation/).
+Full documentation - including advanced installation docs - are available online at <https://dokku.com/docs/getting-started/installation/>.
 
 ## Support
 
-You can use [GitHub Issues](https://github.com/dokku/dokku/issues), check [Troubleshooting](https://dokku.com/docs/getting-started/troubleshooting/) in the documentation, or join us on [Gliderlabs Slack in the #dokku channel](https://glider-slackin.herokuapp.com/).
+You can use [GitHub Issues](https://github.com/dokku/dokku/issues), check [Troubleshooting](https://dokku.com/docs/getting-started/troubleshooting/) in the documentation, or join us on [Gliderlabs Slack in the #dokku channel](https://slack.dokku.com/).
 
 ## Contribution
 
-After checking [GitHub Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](https://dokku.com/docs/getting-started/troubleshooting/) or having a chat with us on [Gliderlabs Slack in the #dokku channel](https://glider-slackin.herokuapp.com/), feel free to fork and create a Pull Request.
+After checking [GitHub Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](https://dokku.com/docs/getting-started/troubleshooting/) or having a chat with us on [Gliderlabs Slack in the #dokku channel](https://slack.dokku.com/), feel free to fork and create a Pull Request.
 
 While we may not merge your PR as is, they serve to start conversations and improve the general Dokku experience for all users.
 

Vagrantfile

@@ -1,12 +1,11 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-18.04"
+BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-20.04"
 BOX_CPUS = ENV["BOX_CPUS"] || "1"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "1024"
 DOKKU_DOMAIN = ENV["DOKKU_DOMAIN"] || "dokku.me"
 DOKKU_IP = ENV["DOKKU_IP"] || "10.0.0.2"
-FORWARDED_PORT = (ENV["FORWARDED_PORT"] || '8080').to_i
 PREBUILT_STACK_URL = File.exist?("#{File.dirname(__FILE__)}/stack.tgz") ? 'file:///root/dokku/stack.tgz' : nil
 PUBLIC_KEY_PATH = "#{Dir.home}/.ssh/id_rsa.pub"
 
@@ -43,7 +42,6 @@ Vagrant::configure("2") do |config|
 
   config.vm.define "dokku", primary: true do |vm|
     vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
 
@@ -72,7 +70,6 @@ Vagrant::configure("2") do |config|
 
   # For windows users. Sharing folder from windows creates problem with sym links and so, sync the repo instead from GOS.
   config.vm.define "dokku-windows", autostart: false do |vm|
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update -qq >/dev/null && apt-get -qq -y --no-install-recommends install git dos2unix >/dev/null"
@@ -81,28 +78,17 @@ Vagrant::configure("2") do |config|
 
   config.vm.define "dokku-deb", autostart: false do |vm|
     vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
     vm.vm.provision :shell, :inline => "cd /root/dokku && make install-from-deb"
   end
 
-  config.vm.define "dokku-rpm", autostart: false do |vm|
-    vm.vm.box = "centos/7"
-    vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
-    vm.vm.hostname = "#{DOKKU_DOMAIN}"
-    vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "cd /root/dokku && bash bootstrap.sh"
-  end
-
   config.vm.define "build", autostart: false do |vm|
     vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update -qq >/dev/null && apt-get -qq -y --no-install-recommends install git >/dev/null && cd /root/dokku && #{make_cmd}"
-    vm.vm.provision :shell, :inline => "export IS_RELEASE=true && cd /root/dokku && make deb-all rpm-all"
+    vm.vm.provision :shell, :inline => "export IS_RELEASE=true && cd /root/dokku && make deb-all"
   end
 
   config.vm.define "build-arch", autostart: false do |vm|
@@ -111,7 +97,6 @@ Vagrant::configure("2") do |config|
     if Pathname.new("#{File.dirname(__FILE__)}/../dokku-arch").exist?
       vm.vm.synced_folder "#{File.dirname(__FILE__)}/../dokku-arch", "/dokku-arch"
     end
-    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
     vm.vm.provision :shell, :inline => "cd /dokku && make arch-all", privileged: false

bootstrap.sh

@@ -3,7 +3,7 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 # A script to bootstrap dokku.
-# It expects to be run on Ubuntu 18.04/20.04, or CentOS 7 via 'sudo'
+# It expects to be run on Ubuntu 20.04/22.04 via 'sudo`
 # If installing a tag higher than 0.3.13, it may install dokku via a package (so long as the package is higher than 0.3.13)
 # It checks out the dokku source code from GitHub into ~/dokku and then runs 'make install' from dokku source.
 
@@ -12,7 +12,7 @@ set -eo pipefail
 # That's good because it prevents our output overlapping with wget's.
 # It also means that we can't run a partially downloaded script.
 
-SUPPORTED_VERSIONS="Debian [9, 10, 11], CentOS [7], Fedora (partial) [33, 34], Ubuntu [18.04, 20.04]"
+SUPPORTED_VERSIONS="Debian [10, 11, 12], Ubuntu [18.04, 20.04, 22.04]"
 
 log-fail() {
   declare desc="log fail formatter"
@@ -28,7 +28,7 @@ ensure-environment() {
     echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
   fi
 
-  hostname -f >/dev/null 2>&1 || {
+  hostname -f &>/dev/null || {
     log-fail "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
   }
 
@@ -63,7 +63,7 @@ install-requirements() {
         apt-get -qq -y --no-install-recommends install software-properties-common
       fi
 
-      add-apt-repository universe >/dev/null
+      add-apt-repository -y universe >/dev/null
       apt-get update -qq >/dev/null
       ;;
   esac
@@ -139,9 +139,6 @@ install-dokku-from-package() {
     debian | ubuntu)
       install-dokku-from-deb-package "$@"
       ;;
-    centos | fedora | rhel)
-      install-dokku-from-rpm-package "$@"
-      ;;
     *)
       log-fail "Unsupported Linux distribution. For manual installation instructions, consult https://dokku.com/docs/getting-started/advanced-installation/"
       ;;
@@ -163,7 +160,7 @@ install-dokku-from-deb-package() {
   local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
   local OS_ID
 
-  if ! in-array "$DOKKU_DISTRO_VERSION" "18.04" "20.04" "9" "10" "11"; then
+  if ! in-array "$DOKKU_DISTRO_VERSION" "18.04" "20.04" "22.04" "10" "11" "12"; then
     log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
   fi
 
@@ -195,24 +192,24 @@ install-dokku-from-deb-package() {
   fi
 
   if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
-    OS_IDS=("bionic" "focal")
+    OS_IDS=("bionic" "focal" "jammy")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
       OS_ID="bionic"
     fi
   elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
-    OS_IDS=("stretch" "buster" "bullseye")
+    OS_IDS=("stretch" "buster" "bullseye" "bookworm")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
       OS_ID="bullseye"
     fi
   elif [[ "$DOKKU_DISTRO" == "raspbian" ]]; then
-    OS_IDS=("buster")
+    OS_IDS=("buster" "bullseye")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
-      OS_ID="buster"
+      OS_ID="bullseye"
     fi
   fi
 
   echo "--> Installing dokku"
-  wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+  wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
   echo "deb https://packagecloud.io/dokku/dokku/$DOKKU_DISTRO/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
   apt-get update -qq >/dev/null
 
@@ -223,48 +220,15 @@ install-dokku-from-deb-package() {
   [[ -n $DOKKU_NGINX_ENABLE ]] && echo "dokku dokku/nginx_enable string $DOKKU_NGINX_ENABLE" | sudo debconf-set-selections
 
   if [[ -n $DOKKU_CHECKOUT ]]; then
-    # shellcheck disable=SC2086
     apt-get -qq -y $NO_INSTALL_RECOMMENDS install "dokku=$DOKKU_CHECKOUT"
   else
-    # shellcheck disable=SC2086
     apt-get -qq -y $NO_INSTALL_RECOMMENDS install dokku
   fi
 }
 
-install-dokku-from-rpm-package() {
-  local DOKKU_CHECKOUT="$1"
-
-  if ! in-array "$DOKKU_DISTRO_VERSION" "7"; then
-    log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
-  fi
-
-  echo "--> Installing docker"
-  curl -fsSL https://get.docker.com/ | sh
-
-  echo "--> Installing epel for nginx packages to be available"
-  yum install -y epel-release
-
-  echo "--> Installing herokuish and dokku"
-  curl -s https://packagecloud.io/install/repositories/dokku/dokku/script.rpm.sh | bash
-  if [[ -n $DOKKU_CHECKOUT ]]; then
-    yum -y install herokuish "dokku-$DOKKU_CHECKOUT"
-  else
-    yum -y install herokuish dokku
-  fi
-
-  echo "--> Enabling docker and nginx on system startup"
-  systemctl enable docker
-  systemctl enable nginx
-
-  echo "--> Starting nginx"
-  systemctl start nginx
-}
-
 main() {
   export DOKKU_DISTRO DOKKU_DISTRO_VERSION
-  # shellcheck disable=SC1091
   DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
-  # shellcheck disable=SC1091
   DOKKU_DISTRO_VERSION=$(. /etc/os-release && echo "$VERSION_ID")
 
   export DEBIAN_FRONTEND=noninteractive

common.mk

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

contrib/build-base.Dockerfile

@@ -1,6 +1,8 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git build-essential wget ruby-dev lintian rpm help2man man-db sudo
+RUN curl -sL -o /usr/local/share/ca-certificates/GlobalSignRootCA_R3.crt https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
+RUN update-ca-certificates
+RUN command -v fpm || gem install fpm

contrib/build-docs

@@ -0,0 +1,154 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
+
+main() {
+  pushd "$ROOT_DIR" >/dev/null || return 1
+  rm -rf docs-main tmp/docs-source tmp/docs-build # tmp/docs-build
+  cp -r docs docs-main
+
+  echo "====> Generating docs image"
+  make docs-build-image
+
+  echo "====> Fetching latest docs"
+  git clone -q https://github.com/dokku/docs.git tmp/docs-build
+
+  echo "====> Processing version: latest"
+  rm -rf tmp/docs-build/docs
+  git clone -q https://github.com/dokku/dokku.git tmp/docs-source
+
+  rm -rf docs/assets
+  mkdir -p docs/assets
+  cp -r docs-main/assets/extra.css docs/assets/extra.css
+  cp -r docs-main/assets/favicons docs/assets/favicons
+  cp -r docs-main/assets/dokku-logo.svg docs/assets/dokku-logo.svg
+
+  rm -rf tmp/docs-build/assets
+  cp -r docs-main/assets tmp/docs-build/assets
+  cp docs-main/_build/app-nginx.conf.sigil tmp/docs-build/app-nginx.conf.sigil
+  mkdir -p tmp/docs-build/nginx.conf.d
+  touch tmp/docs-build/.static
+  echo "[]" >tmp/docs-build/versions.json
+
+  sed -i.bak "s/outdated/outdated_hidden/g" docs/_overrides/main.html && rm docs/_overrides/main.html.bak
+  echo "----> Generating docs"
+  make docs-build
+  if [[ -n "$GITHUB_ACTION" ]]; then
+    sudo chown -R "$(whoami)" site
+  fi
+
+  rm -rf site/_build
+  mv site tmp/docs-build/docs
+  mv docs/home.html tmp/docs-build/index.html
+  sed -i.bak "s/{{NAME}}~{{REF}}/docs/g" tmp/docs-build/index.html && rm tmp/docs-build/index.html.bak
+  sed -i.bak "s/{{NAME}}/docs/g" tmp/docs-build/index.html && rm tmp/docs-build/index.html.bak
+  sed -i.bak 's/="\/docs\/"/="\/"/g' tmp/docs-build/index.html && rm tmp/docs-build/index.html.bak
+
+  jq -C -r '.["max-versions"][]' docs-main/assets/versions.json | while read -r current_version; do
+    major="$(echo "$current_version" | cut -d'.' -f1)"
+    minor="$(echo "$current_version" | cut -d'.' -f2)"
+    patch="$(echo "$current_version" | cut -d'.' -f3)"
+    while true; do
+      if [[ "$patch" -lt 0 ]]; then
+        break
+      fi
+      version="${major}.${minor}.${patch}"
+      echo "====> Processing version: ${major}.${minor}.${patch}"
+
+      if [[ "$major" -lt 1 ]]; then
+        if [[ "$current_version" != "$version" ]]; then
+          echo "      Writing rewrite rule"
+          echo "rewrite ^/docs~v$version/(.*)$ /docs~v$current_version/\$1 redirect;" >"tmp/docs-build/nginx.conf.d/$version.conf"
+          echo "      Removing old docs"
+          rm -rf "tmp/docs-build/docs~v${version}"
+          patch=$((patch - 1))
+          continue
+        fi
+      fi
+
+      jq --arg title "v$version" --arg version "docs~v$version" '. += [{"title": $title, "version": $version, "aliases": []}]' tmp/docs-build/versions.json >tmp/docs-build/versions.json.bak
+      mv tmp/docs-build/versions.json.bak tmp/docs-build/versions.json
+      if [[ -d "tmp/docs-build/docs~v${version}" ]]; then
+        echo " !    Docs exist, skipping regeneration"
+        rm -rf "tmp/docs-build/docs~v${version}/assets/favicons"
+        cp -r docs-main/assets/favicons "tmp/docs-build/docs~v${version}/assets/favicons"
+        cp -r docs-main/assets/dokku-logo.svg "tmp/docs-build/docs~v${version}/assets/dokku-logo.svg"
+        cp -r docs-main/assets/extra.css "tmp/docs-build/docs~v${version}/assets/extra.css"
+        patch=$((patch - 1))
+        continue
+      fi
+
+      git -C tmp/docs-source checkout -q -- .
+      git -C tmp/docs-source checkout -q "tags/v${version}" -b "v${version}-branch"
+      rm -rf docs
+      mv tmp/docs-source/docs docs
+
+      rm -rf docs/assets
+      mkdir -p docs/assets
+      cp -r docs-main/assets/favicons docs/assets/favicons
+      cp -r docs-main/assets/dokku-logo.svg docs/assets/dokku-logo.svg
+      cp -r docs-main/assets/extra.css docs/assets/extra.css
+
+      cp -r docs-main/_build docs/_build
+      cp -r docs-main/_overrides docs/_overrides
+      git checkout -q -- mkdocs.yml
+      sed -i.bak "s/site_dir: site/site_dir: docs~v$version/g" mkdocs.yml && rm mkdocs.yml.bak
+      if [[ ! -f docs/template.html ]]; then
+        if [[ "$patch" -eq 0 ]]; then
+          break
+        fi
+
+        continue
+      fi
+
+      echo "----> Generating docs"
+      if ! make docs-build; then
+        continue
+      fi
+
+      if [[ -d "docs~v${version}" ]]; then
+        if [[ -n "$GITHUB_ACTION" ]]; then
+          sudo chown -R "$(whoami)" "docs~v${version}"
+        fi
+
+        rm -rf "docs~v${version}/_build"
+        mv "docs~v${version}" "tmp/docs-build/docs~v${version}"
+      fi
+
+      if [[ "$patch" -eq 0 ]]; then
+        break
+      fi
+      patch=$((patch - 1))
+    done
+  done
+
+  echo "====> Rebuild versions"
+  if [[ -f "tmp/docs-build/versions.json" ]]; then
+    python contrib/sort-mkdocs-versions
+  else
+    echo "      No version file exists"
+  fi
+
+  echo "====> Cleanup main repo"
+  rm -rf docs
+  mv docs-main docs
+  git checkout -- mkdocs.yml docs
+
+  if [[ "$(git -C tmp/docs-build ls-files -dmo)" == "docs/sitemap.xml.gz" ]]; then
+    echo " !    No doc changes found"
+    git -C tmp/docs-build checkout -- docs/sitemap.xml.gz
+  else
+    echo "====> Pushing docs"
+    git -C tmp/docs-build add .
+    git -C tmp/docs-build commit -m "chore: regenerate docs"
+
+    if [[ -n "$BOT_GITHUB_USERNAME" ]] && [[ -n "$BOT_GITHUB_API_TOKEN" ]]; then
+      git -C tmp/docs-build remote set-url origin "https://$BOT_GITHUB_USERNAME:$BOT_GITHUB_API_TOKEN@github.com/dokku/docs.git"
+    fi
+
+    git -C tmp/docs-build push origin master
+  fi
+}
+
+main "$@"

contrib/build-dokku.Dockerfile

@@ -2,13 +2,10 @@ FROM dokku/build-base:0.0.1 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
-
 ARG GOLANG_VERSION
 
-RUN wget -qO /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \
-  && tar -C /usr/local -xzf /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz \
+RUN wget -qO /tmp/go${GOLANG_VERSION}.linux.tar.gz "https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-$(dpkg --print-architecture).tar.gz" \
+  && tar -C /usr/local -xzf /tmp/go${GOLANG_VERSION}.linux.tar.gz \
   && cp /usr/local/go/bin/* /usr/local/bin
 
 ARG WORKDIR=/go/src/github.com/dokku/dokku
@@ -18,7 +15,7 @@ WORKDIR ${WORKDIR}
 COPY Makefile ${WORKDIR}/
 COPY *.mk ${WORKDIR}/
 
-RUN make deb-setup rpm-setup sshcommand plugn
+RUN make deb-setup sshcommand plugn
 
 COPY . ${WORKDIR}
 
@@ -37,7 +34,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
   IS_RELEASE=${IS_RELEASE} \
   SKIP_GO_CLEAN=true \
   make version copyfiles \
-  && make deb-dokku rpm-dokku
+  && make deb-dokku
 
 FROM builder as armhf
 
@@ -59,4 +56,24 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
   GOARCH=arm make version copyfiles \
   && DOKKU_ARCHITECTURE=armhf GOARCH=arm make deb-dokku
 
+FROM builder as arm64
+
+COPY --from=armhf /tmp /tmp
+COPY --from=amd64 /usr/local/share/man/man1/dokku.1 /usr/local/share/man/man1/dokku.1-generated
+
+RUN rm -rf /tmp/build-dokku
+
+ARG PLUGIN_MAKE_TARGET
+ARG DOKKU_VERSION=master
+ARG DOKKU_GIT_REV
+ARG IS_RELEASE=false
+
+RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
+  DOKKU_VERSION=${DOKKU_VERSION} \
+  DOKKU_GIT_REV=${DOKKU_GIT_REV} \
+  IS_RELEASE=${IS_RELEASE} \
+  SKIP_GO_CLEAN=true \
+  GOARCH=arm64 make version copyfiles \
+  && DOKKU_ARCHITECTURE=arm64 GOARCH=arm64 make deb-dokku
+
 RUN ls -lha /tmp/

contrib/copy-packages

@@ -5,19 +5,17 @@ import shutil
 import subprocess
 from requests.auth import HTTPBasicAuth
 
-PACKAGECLOUD_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_TOKEN')
+PACKAGECLOUD_TOKEN = os.getenv("DOKKU_PACKAGECLOUD_TOKEN")
 
 
 def download_file(filename, url):
     r = requests.get(url, stream=True)
-    with open(filename, 'wb') as f:
+    with open(filename, "wb") as f:
         shutil.copyfileobj(r.raw, f)
 
 
 def upload_file(filename):
-    versions = [
-        "focal"
-    ]
+    versions = ["jammy"]
     cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
     for version in versions:
         cmd = cmd_template.format(version, filename)
@@ -25,21 +23,22 @@ def upload_file(filename):
 
 
 def main():
-    auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '')
-    base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/bionic.json',
-                        auth=auth)
+    auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, "")
+    base = requests.get(
+        "https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/focal.json",
+        auth=auth,
+    )
     data = base.json()
     urls = []
     for package in data:
-        urls.append(package['versions_url'])
+        urls.append(package["versions_url"])
 
     download_urls = {}
     for url in urls:
-        base = requests.get('https://packagecloud.io{0}'.format(url),
-                            auth=auth)
+        base = requests.get("https://packagecloud.io{0}".format(url), auth=auth)
         data = base.json()
         for version in data:
-            download_urls['downloads/' + version['filename']] = version['download_url']
+            download_urls["downloads/" + version["filename"]] = version["download_url"]
 
     for filename, download_url in download_urls.items():
         print("downloading {0}".format(filename))

contrib/dokku-docker-bin.sh

@@ -4,5 +4,4 @@ set -eo pipefail
 DOKKU_DOCKER_CONTAINER_NAME=${DOKKU_DOCKER_CONTAINER_NAME:=dokku}
 
 # TODO: handle cases where we need a tty
-# shellcheck disable=SC2086
 docker exec $DOKKU_DOCKER_ENV -i "$DOKKU_DOCKER_CONTAINER_NAME" dokku "$@"

contrib/dokku_client.sh

@@ -49,7 +49,7 @@ fn-dokku-host() {
   declare DOKKU_GIT_REMOTE="$1" DOKKU_HOST="$2"
 
   if [[ -z "$DOKKU_HOST" ]]; then
-    if [[ -d .git ]] || git rev-parse --git-dir >/dev/null 2>&1; then
+    if [[ -d .git ]] || git rev-parse --git-dir &>/dev/null; then
       DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^${DOKKU_GIT_REMOTE}\s" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
     fi
   fi
@@ -61,9 +61,13 @@ fn-dokku-host() {
   echo "$DOKKU_HOST"
 }
 
+fn-get-remote() {
+  git config dokku.remote 2>/dev/null || echo "dokku"
+}
+
 main() {
   declare CMD="$1" APP_ARG="$2"
-  local APP="" DOKKU_GIT_REMOTE="dokku" DOKKU_REMOTE_HOST=""
+  local APP="" DOKKU_GIT_REMOTE="$(fn-get-remote)" DOKKU_REMOTE_HOST=""
   local cmd_set=false next_index=1 skip=false args=("$@")
 
   for arg in "$@"; do
@@ -100,12 +104,12 @@ main() {
   done
 
   DOKKU_REMOTE_HOST="$(fn-dokku-host "$DOKKU_GIT_REMOTE" "$DOKKU_HOST")"
-  if [[ -z "$DOKKU_REMOTE_HOST" ]]; then
+  if [[ -z "$DOKKU_REMOTE_HOST" ]] && [[ "$CMD" != remote ]] && [[ "$CMD" != remote:* ]]; then
     fn-client-help-msg
   fi
 
   if [[ -z "$APP" ]]; then
-    if [[ -d .git ]] || git rev-parse --git-dir >/dev/null 2>&1; then
+    if [[ -d .git ]] || git rev-parse --git-dir &>/dev/null; then
       set +e
       APP=$(git remote -v 2>/dev/null | grep -Ei "^${DOKKU_GIT_REMOTE}\s" | grep -Ei "dokku@$DOKKU_REMOTE_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
       set -e
@@ -143,15 +147,49 @@ main() {
     apps:destroy)
       fn-is-git-repo && fn-has-dokku-remote && git remote remove "$DOKKU_GIT_REMOTE"
       ;;
+    remote)
+      echo "$DOKKU_GIT_REMOTE"
+      exit 0
+      ;;
+    remote:add)
+      shift 1
+      git remote add "$@"
+      exit "$?"
+      ;;
+    remote:list)
+      git remote
+      exit "$?"
+      ;;
+    remote:set)
+      shift 1
+      git config dokku.remote "$@"
+      exit "$?"
+      ;;
+    remote:remove)
+      shift 1
+      git remote remove "$@"
+      local exit_code="$?"
+      if [[ "$(git config dokku.remote)" == "$1" ]]; then
+        git config --unset dokku.remote
+      fi
+      exit "$exit_code"
+      ;;
+    remote:unset)
+      if [[ -n "$(git config dokku.remote)" ]]; then
+        git config --unset dokku.remote
+        exit "$?"
+      fi
+      exit 0
+      ;;
   esac
 
   [[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
   [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:restore " == *" $CMD "* ]] && unset APP
+  [[ " storage:ensure-directory " == *" $CMD "* ]] && unset APP
   [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
   [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
   [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
   # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@"
-  # shellcheck disable=SC2068,SC2086
   ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@ || {
     ssh_exit_code="$?"
     echo " !     Failed to execute dokku command over ssh: exit code $?" 1>&2

contrib/images/digitalocean/files/etc/nginx/sites-available/digitalocean

@@ -0,0 +1,95 @@
+# You may add here your
+# server {
+#	...
+# }
+# statements for each of your virtual hosts to this file
+
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+# http://wiki.nginx.org/Pitfalls
+# http://wiki.nginx.org/QuickStart
+# http://wiki.nginx.org/Configuration
+#
+# Generally, you will want to move this file somewhere, and start with a clean
+# file but keep this around for reference. Or just disable in sites-enabled.
+#
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
+##
+
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server ipv6only=on;
+
+	root /var/www/html;
+	index index.php index.html index.htm;
+
+	# Make site accessible from http://localhost/
+	server_name localhost;
+
+	location / {
+		# First attempt to serve request as file, then
+		# as directory, then fall back to displaying a 404.
+		try_files $uri $uri/ =404;
+		# Uncomment to enable naxsi on this location
+		# include /etc/nginx/naxsi.rules
+	}
+
+	error_page 404 /404.html;
+	error_page 500 502 503 504 /50x.html;
+	location = /50x.html {
+		root /usr/share/nginx/html;
+	}
+
+	location ~ \.php$ {
+        include snippets/fastcgi-php.conf;
+        fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+	}
+
+	# deny access to .htaccess files, if Apache's document root
+	# concurs with nginx's one
+	#
+	#location ~ /\.ht {
+	#	deny all;
+	#}
+}
+
+
+# another virtual host using mix of IP-, name-, and port-based configuration
+#
+#server {
+#	listen 8000;
+#	listen somename:8080;
+#	server_name somename alias another.alias;
+#	root html;
+#	index index.html index.htm;
+#
+#	location / {
+#		try_files $uri $uri/ =404;
+#	}
+#}
+
+
+# HTTPS server
+#
+#server {
+#	listen 443;
+#	server_name localhost;
+#
+#	root html;
+#	index index.html index.htm;
+#
+#	ssl on;
+#	ssl_certificate cert.pem;
+#	ssl_certificate_key cert.key;
+#
+#	ssl_session_timeout 5m;
+#
+#	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
+#	ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
+#	ssl_prefer_server_ciphers on;
+#
+#	location / {
+#		try_files $uri $uri/ =404;
+#	}
+#}

contrib/images/digitalocean/files/etc/update-motd.d/99-one-click

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Configured as part of the DigitalOcean 1-Click Image build process
+
+myip=$(hostname -I | awk '{print$1}')
+cat <<EOF
+********************************************************************************
+
+Welcome to DigitalOcean's 1-Click Dokku Droplet.
+To keep this Droplet secure, the UFW firewall is enabled. 
+All ports are BLOCKED except 22 (SSH), 80 (HTTP), 443 (HTTPS).
+
+In a web browser, you can view:
+ * The Dokku One-Click Quickstart guide: https://do.co/dokku1804#start
+
+For help and more information, visit https://do.co/dokku1804
+
+********************************************************************************
+To delete this message of the day: rm -rf $(readlink -f ${0})
+To remove the default web landing page: rm -rf /etc/nginx/sites-available/digitalocean
+EOF

contrib/images/digitalocean/files/var/lib/cloud/scripts/per-once/001_setup

@@ -0,0 +1,25 @@
+#!/bin/bash -x
+set +e
+exec > >(tee /var/log/one_click_setup.log) 2>&1
+
+ufw --force enable
+printf "dokku dokku/hostname string %s" hostname | debconf-set-selections
+
+export DEBIAN_FRONTEND=noninteractive
+export LANG=C
+export LC_ALL=C
+
+# Install Dokku....
+for count in {1..30}; do
+  dpkg -i /var/lib/digitalocean/debs/*deb || /bin/true
+  apt-get -f install || /bin/true
+
+  version=$(dpkg-query --showformat='${Version}' -W dokku)
+  if [[ -n "$version" ]]; then
+    ran=0
+    exit 0
+  else
+    count=$((count + 1))
+  fi
+  sleep 5
+done

contrib/images/digitalocean/files/var/lib/cloud/scripts/per-once/002_enable_ssh

@@ -0,0 +1,9 @@
+#!/bin/bash
+exec > >(tee /var/log/one_click_setup.log) 2>&1
+
+# Remove the force command
+sed -e '/Match user root/d' \
+  -e '/.*ForceCommand.*droplet.*/d' \
+  -i /etc/ssh/sshd_config
+
+systemctl restart ssh

contrib/images/digitalocean/files/var/www/html/index.html

@@ -0,0 +1,169 @@
+<html>
+
+<head>
+  <style>
+    body {
+      font-family: ProximaNova;
+      font-size: 15px;
+      font-style: normal;
+      font-stretch: normal;
+      line-height: 1;
+      letter-spacing: normal;
+      margin: 0;
+    }
+
+    .button {
+      border-radius: 3px;
+      background-color: #0069ff;
+      color: #ffffff;
+      display: flex;
+      flex-direction: column;
+      height: 48px;
+      justify-content: center;
+      text-decoration: none;
+      width: 148px;
+    }
+
+    .content {
+      align-items: center;
+      border: solid 2px #f1f1f1;
+      border-radius: 3px;
+      display: flex;
+      flex-direction: column;
+      margin: 32px auto;
+      padding: 32px;
+      text-align: center;
+      width: 960px;
+      ;
+    }
+
+    .copyright {
+      color: #99999999;
+      font-size: 13px;
+      margin-left: 10px;
+    }
+
+    .description {
+      color: #676767;
+    }
+
+    .empty-access {
+      height: 220px;
+      margin-bottom: -20px;
+    }
+
+    .header {
+      align-items: center;
+      display: flex;
+      margin: 15px;
+    }
+
+    .logo {
+      height: 30px;
+      color: #999999;
+      width: 30px;
+    }
+
+    .title {
+      font-family: ProximaNova;
+      font-size: 21px;
+      font-weight: 600;
+      color: #444444;
+    }
+  </style>
+</head>
+
+<body>
+  <div class="header">
+    <svg class="logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 30 30" enable-background="new 0 0 30 30"
+      xml:space="preserve">
+      <g id="XMLID_17_">
+        <g id="XMLID_18_">
+          <g>
+            <g id="XMLID_225_">
+              <g id="XMLID_233_">
+                <path id="XMLID_234_" fill="#0080FF"
+                  d="M15,30v-5.8c6.2,0,10.9-6.1,8.6-12.6c-0.9-2.4-2.8-4.3-5.2-5.2
+                    C11.9,4.1,5.8,8.8,5.8,15l0,0L0,15C0,5.2,9.5-2.5,19.8,0.7c4.5,1.4,8.1,5,9.5,9.5C32.5,20.5,24.8,30,15,30z" />
+              </g>
+              <polygon id="XMLID_232_" fill="#0080FF" points="15,24.2 9.2,24.2 9.2,18.4 9.2,18.4 15,18.4 15,18.4" />
+              <polygon id="XMLID_228_" fill="#0080FF" points="9.2,28.7 4.8,28.7 4.8,28.7 4.8,24.2 9.2,24.2" />
+              <polygon id="XMLID_226_" fill="#0080FF" points="4.8,24.2 1,24.2 1,24.2 1,20.5 1,20.5 4.8,20.5 4.8,20.5" />
+            </g>
+          </g>
+        </g>
+      </g>
+    </svg>
+    <div class="copyright">&copy; 2023 DigitalOcean, LLC. All rights reserved.</div>
+  </div>
+
+  <div class="content">
+    <svg width="89" height="62" viewBox="0 0 89 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M78.4046 17.1912C84.738 21.1608 86.2188 20.7419 87.6794 19.9955C88.5202 19.5664 88.8496 18.5392 88.4243 17.6985C86.4622 13.818 78.212 0.118992 59.5364 0.118992C43.8588 0.118992 34.4377 13.3435 31.5684 18.0766C31.0067 19.0027 31.4447 20.2158 32.4755 20.5543C34.1357 21.0995 35.9508 21.216 39.8333 18.8625C52.5306 11.8038 78.4046 17.1912 78.4046 17.1912Z"
+        fill="#F15B55" />
+      <mask id="mask0_55_415" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="31" y="0" width="58" height="21">
+        <path
+          d="M78.4212 17.0723C84.7546 21.0418 86.2354 20.6229 87.696 19.8766C88.5368 19.4474 88.8662 18.4202 88.4409 17.5795C86.4788 13.699 78.2286 3.8147e-06 59.553 3.8147e-06C43.8754 3.8147e-06 34.4543 13.2245 31.585 17.9576C31.0233 18.8837 31.4613 20.0969 32.4921 20.4353C34.1523 20.9805 35.9674 21.097 39.8499 18.7436C52.5472 11.6848 78.4212 17.0723 78.4212 17.0723Z"
+          fill="#F15B55" />
+      </mask>
+      <g mask="url(#mask0_55_415)">
+        <path d="M43.7907 2.62413C49.4945 9.99967 33.5952 13.8544 45.8049 22.3539" stroke="#FF9580" stroke-width="1.5"
+          stroke-miterlimit="10" />
+        <path d="M56.7977 -1.62458C62.8837 6.0383 46.832 8.92189 53.8305 19.6981" stroke="#FF9580" stroke-width="1.5"
+          stroke-miterlimit="10" />
+        <path d="M72.3168 -0.867853C76.7291 7.02473 58.5477 8.73199 64.5571 18.3322" stroke="#FF9580" stroke-width="1.5"
+          stroke-miterlimit="10" />
+        <path d="M84.2603 7.02465C84.2603 15.1449 71.708 10.5128 72.3169 19.6982" stroke="#FF9580" stroke-width="1.5"
+          stroke-miterlimit="10" />
+      </g>
+      <g opacity="0.399994">
+        <g opacity="0.399994">
+          <path opacity="0.399994"
+            d="M31.3365 18.747C31.2415 19.5146 31.6815 20.2937 32.4751 20.5544C34.1353 21.0993 35.9508 21.2158 39.8333 18.8623C52.5302 11.8039 78.4042 17.1914 78.4042 17.1914C84.7377 21.1606 86.2184 20.7416 87.6795 19.9957C88.3903 19.6328 88.7337 18.8419 88.5657 18.0976C78.1555 10.8635 54.5866 3.8145 31.3365 18.747Z"
+            fill="black" />
+        </g>
+      </g>
+      <path
+        d="M67.274 14.8087H56.4204C44.6233 14.8087 38.4193 18.2775 33.8378 24.2005L29.4542 29.8671L27.7038 32.1805C26.3653 33.9491 24.2728 34.9885 22.0517 34.9885C18.6867 34.9885 15.8194 32.6685 15.0623 29.48C15.0512 29.433 15.0385 29.359 15.025 29.2679C14.9103 28.4884 15.5203 27.7899 16.3099 27.7899H18.4798C22.2049 27.7899 25.2246 24.7776 25.2246 21.0614V20.5325C25.2246 19.8467 24.667 19.2904 23.979 19.2904H17.6005C15.0492 19.2904 13.2669 20.6106 12.6674 22.0612C12.0676 20.6106 10.2853 19.2904 7.73397 19.2904H1.35542C0.667492 19.2904 0.109863 19.8467 0.109863 20.5325V21.0614C0.109863 24.7776 3.12951 27.7899 6.85471 27.7899H9.05492C9.75186 27.7899 10.3443 28.2988 10.4476 28.9867L10.6905 30.604C13.3361 48.2223 28.5057 61.2576 46.3638 61.2576H47.2697H59.4081C71.7445 61.2576 82.2727 52.3616 84.302 40.2227L85.8397 31.0254C87.259 22.5369 81.2902 14.8087 67.274 14.8087Z"
+        fill="#07CBCF" />
+      <path
+        d="M81.4705 48.3116C79.3404 48.386 77.5986 49.0698 75.2239 51.4388C72.2001 54.4552 67.1794 57.8702 59.4197 57.8702H45.0417C39.2224 57.8702 35.1162 53.5434 35.1162 53.5434C35.1162 53.5434 31.7479 53.7154 24.4261 49.5603C12.4254 41.9906 11.9501 29.2979 11.7788 27.7043C11.6076 26.1106 10.7517 25.2568 9.04025 25.2568H6.70074C2.34293 25.2568 1.16088 23.1183 0.893741 19.3792C0.434853 19.5628 0.110352 20.0095 0.110352 20.5327V21.0612C0.110352 24.7773 3.13 27.7897 6.85479 27.7897H9.055C9.75235 27.7897 10.3448 28.2986 10.4481 28.9864L10.6906 30.6038C13.3362 48.2221 28.5062 61.2573 46.3643 61.2573H47.2698H59.4086C68.7888 61.2573 77.1226 56.113 81.4705 48.3116Z"
+        fill="#05B7BF" />
+      <path
+        d="M15.0249 29.2677C14.9102 28.4883 15.5203 27.7898 16.3098 27.7898H18.4797C22.2049 27.7898 25.2246 24.7774 25.2246 21.0617V20.5328C25.2246 20.0092 24.8997 19.5624 24.4404 19.3793V19.3797C24.1728 23.1184 22.9908 25.2569 18.633 25.2569H16.8376C14.4411 25.2569 14.7549 27.9512 15.0249 29.2677Z"
+        fill="#05B7BF" />
+      <path
+        d="M24.4257 49.5606C27.1262 52.1789 25.7188 53.2412 21.2307 53.2412H14.3327C13.2428 53.2412 12.697 54.5557 13.4677 55.3245L14.322 56.1767C16.9737 58.8224 20.5707 60.3085 24.3213 60.3085H24.9584C32.4133 60.3085 37.929 52.8239 37.929 52.8239L24.4257 49.5606Z"
+        fill="#07CBCF" />
+      <path
+        d="M35.1162 53.544C32.9984 55.5574 29.4485 58.1536 25.2235 58.1536H24.6339C21.1631 58.1536 17.8345 56.7783 15.3807 54.33L14.59 53.5415C14.497 53.4488 14.4257 53.3474 14.3728 53.2411H14.3327C13.2428 53.2411 12.697 54.5556 13.4677 55.3244L14.322 56.1766C16.9741 58.8223 20.5711 60.3085 24.3213 60.3085H24.9584C29.8025 60.3085 33.8281 57.1482 36.0533 54.9349L36.3528 54.6312L35.1162 53.544Z"
+        fill="#05B7BF" />
+      <mask id="mask1_55_415" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="15" width="86" height="47">
+        <path
+          d="M67.1641 15.1884H56.3106C44.5134 15.1884 38.3094 18.6572 33.7279 24.5802L29.3443 30.2468L27.594 32.5602C26.2554 34.3288 24.163 35.3682 21.9419 35.3682C18.5768 35.3682 15.7096 33.0482 14.9524 29.8597C14.9413 29.8127 14.9286 29.7387 14.9151 29.6476C14.8004 28.8681 15.4105 28.1696 16.2 28.1696H18.3699C22.0951 28.1696 25.1147 25.1573 25.1147 21.4411V20.9122C25.1147 20.2264 24.5571 19.6701 23.8692 19.6701H17.4906C14.9393 19.6701 13.157 20.9903 12.5576 22.4409C11.9577 20.9903 10.1755 19.6701 7.62411 19.6701H1.24555C0.557629 19.6701 0 20.2264 0 20.9122V21.4411C0 25.1573 3.01965 28.1696 6.74484 28.1696H8.94506C9.64199 28.1696 10.2344 28.6785 10.3377 29.3664L10.5807 30.9837C13.2262 48.602 28.3958 61.6373 46.2539 61.6373H47.1598H59.2983C71.6346 61.6373 82.1628 52.7413 84.1922 40.6024L85.7299 31.4051C87.1491 22.9166 81.1803 15.1884 67.1641 15.1884Z"
+          fill="#07CBCF" />
+      </mask>
+      <g mask="url(#mask1_55_415)">
+        <path
+          d="M48.2573 43.0378C50.1929 48.5818 55.4426 52.9185 61.7015 52.9185C72.2568 52.9185 71.2993 45.7048 82.7326 45.7048H84.3526"
+          stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10" stroke-linecap="round" />
+        <path d="M50.1195 43.0151H46.9814" stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10"
+          stroke-linecap="round" />
+        <path
+          d="M65.353 42.7305C65.353 41.096 64.0247 39.7709 62.3862 39.7709C60.7478 39.7709 59.4194 41.096 59.4194 42.7305"
+          stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10" stroke-linecap="round" />
+      </g>
+      <path
+        d="M77.4491 19.774C80.7847 21.9824 82.0434 23.4419 85.095 23.7701C82.9402 18.5919 77.0788 14.8087 67.2741 14.8087H56.4206C45.0819 14.8087 38.9111 18.0148 34.3804 23.5229C37.2443 23.5229 40.3812 21.1661 43.0628 19.698C46.182 17.9907 50.3669 16.3586 59.4197 16.3586C68.4725 16.3586 73.2651 17.004 77.4491 19.774Z"
+        fill="#05B7BF" />
+    </svg>
+
+    <h1 class="title">Please log into your Droplet with SSH to configure the Dokku installation.</h1>
+    <p class="description">See the Dokku 1-Click Quickstart guide for detailed assistance.</p>
+    <a class="button" href="https://do.co/dokku1804#start">Quickstart Guide</a>
+  </div>
+</body>
+
+</html>

contrib/images/digitalocean/in_parts/011-docker

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+export DEBIAN_FRONTEND=noninteractive
+
+pkgs=(apt-transport-https
+  ca-certificates
+  curl
+  jq
+  linux-image-extra-virtual
+  software-properties-common
+)
+
+echo '--> Updating apt repositories'
+apt-get -qqy update
+
+echo '--> Updating all packages'
+apt-get -qqy -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade
+
+echo "--> Installing basic dependencies: ${pkgs[*]}"
+apt-get -qqy install "${pkgs[@]}"
+
+echo '--> Setting up docker apt repository'
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+
+cat >/etc/apt/sources.list.d/docker.list <<EOM
+deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(lsb_release -c -s) stable
+EOM
+
+echo '--> Installing docker-ce'
+apt-get -y update
+apt-get -y install docker-ce docker-compose-plugin
+
+echo '--> Enabling docker-ce'
+systemctl enable docker
+systemctl start docker
+
+echo '--> Enabling docker live-restore'
+if [[ ! -f /etc/docker/daemon.json ]]; then
+  echo "{}" >/etc/docker/daemon.json
+fi
+
+config="$(jq '. + {"live-restore": true}' /etc/docker/daemon.json)"
+echo "$config" >/etc/docker/daemon.json
+systemctl reload docker
+docker info | grep -i live

contrib/images/digitalocean/in_parts/011-ssh-message

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Prevent login until after setup is complete'
+# Be a bit of a dork about login in
+cat >>/etc/ssh/sshd_config <<EOM
+Match User root
+        ForceCommand echo "Please wait while we get your droplet ready..."
+EOM

contrib/images/digitalocean/in_parts/012-dokku-packages

@@ -0,0 +1,67 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+export DEBIAN_FRONTEND=noninteractive
+
+pkgs=(apache2-utils
+  bash-completion
+  locales
+  git
+  cpio
+  curl
+  man-db
+
+  netcat
+  net-tools
+
+  software-properties-common
+  parallel
+  python3-software-properties
+  rsync
+  rsyslog
+  dos2unix
+  jq
+  unzip
+
+  nginx
+  dnsutils
+  cgroupfs-mount
+  cgroup-lite
+  sudo
+  python3
+  debconf
+)
+
+dokku_pkgs=(docker-container-healthchecker
+  docker-image-labeler
+  gliderlabs-sigil
+  lambda-builder
+  netrc
+  plugn
+  procfile-util
+  sshcommand
+)
+
+echo '--> Install core dependencies for dokku'
+apt-get -y install "${pkgs[@]}"
+
+echo '--> Setting up dokku apt repository'
+curl -fsSL https://packagecloud.io/dokku/dokku/gpgkey -o /etc/apt/keyrings/dokku.asc
+
+cat >/etc/apt/sources.list.d/dokku.list <<EOM
+deb [arch=amd64 signed-by=/etc/apt/keyrings/dokku.asc]  https://packagecloud.io/dokku/dokku/ubuntu/ bionic main
+EOM
+
+echo '--> Install dependencies for dokku from new repository'
+apt-get -y clean
+apt-get -y update
+apt-get -y install "${dokku_pkgs[@]}"
+rm -f /etc/nginx/sites-enabled/default
+
+echo '--> Pre-cache dokku bits that are must run on boot'
+apt-get -y clean
+apt-get -y install --download-only "dokku=${DOKKU_VERSION}" dokku-event-listener herokuish
+
+mkdir -p /var/lib/digitalocean/debs
+cp -au /var/cache/apt/archives/*deb /var/lib/digitalocean/debs

contrib/images/digitalocean/in_parts/012-grub-opts

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Update grub boot loader'
+sed -e 's|GRUB_CMDLINE_LINUX="|GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1|g' \
+  -i /etc/default/grub
+
+update-grub

contrib/images/digitalocean/in_parts/014-docker-dns

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Enable Google DNS for Docker'
+sed -e 's|#DOCKER_OPTS|DOCKER_OPTS|g' \
+  -i /etc/default/docker

contrib/images/digitalocean/in_parts/014-ufw-rules

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Enable and configure UFW'
+sed -e 's|DEFAULT_FORWARD_POLICY=.*|DEFAULT_FORWARD_POLICY="ACCEPT"|g' \
+  -i /etc/default/ufw
+
+ufw limit ssh
+ufw allow 'Nginx Full'
+
+ufw --force enable

contrib/images/digitalocean/in_parts/099-application_tag

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Write the application info'
+application_version="$DOKKU_VERSION"
+build_date="$(date -I)"
+distro_arch="$(uname -m)"
+distro_codename="$(lsb_release -sc)"
+distro_release="$(lsb_release -sr)"
+distro="$(lsb_release -si)"
+
+cat >/var/lib/digitalocean/application.info <<EOM
+appiication_name="Dokku"
+build_date="${build_date}"
+distro="${distro}"
+distro_release="${distro_release}"
+distro_codename="${distro_codename}"
+distro_arch="${distro_arch}"
+application_version="${application_version}"
+EOM

contrib/images/digitalocean/in_parts/099-cleanup

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -eo pipefail
+set -o errexit
+
+echo '--> Cleaning up tmp dir'
+# Ensure /tmp exists and has the proper permissions before
+# checking for security updates
+# https://github.com/digitalocean/marketplace-partners/issues/94
+if [[ ! -d /tmp ]]; then
+  mkdir /tmp
+fi
+chmod 1777 /tmp
+rm -rf /tmp/* /var/tmp/*
+
+echo '--> Cleaning up apt'
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y update
+apt-get -o Dpkg::Options::="--force-confold" upgrade -q -y --force-yes
+apt-get -y autoremove
+apt-get -y autoclean
+apt-get -y purge droplet-agent
+
+echo '--> Clearing history'
+history -c
+cat /dev/null >/root/.bash_history
+unset HISTFILE
+
+echo '--> Clearing log files'
+find /var/log -mtime -1 -type f -exec truncate -s 0 {} \;
+rm -rf /var/log/*.gz /var/log/*.[0-9] /var/log/*-????????
+cat /dev/null >/var/log/lastlog
+cat /dev/null >/var/log/wtmp
+rm -rf /var/lib/cloud/instances/*
+rm -rf /tmp/* /var/tmp/*
+
+echo '--> Removing keys'
+rm -f /root/.ssh/authorized_keys /etc/ssh/*key*
+touch /etc/ssh/revoked_keys
+chmod 600 /etc/ssh/revoked_keys
+
+echo '--> DO Directory contents'
+ls -lah /opt/digitalocean || true
+
+echo '--> Securely erase the unused portion of the filesystem'
+printf "\n\033[0;32mWriting zeros to the remaining disk space to securely
+erase the unused portion of the file system.
+Depending on your disk size this may take several minutes.
+The secure erase will complete successfully when you see:\033[0m
+    dd: writing to '/zerofile': No space left on device\n
+Beginning secure erase now\n"
+
+dd if=/dev/zero of=/zerofile bs=4096 || rm /zerofile

contrib/images/digitalocean/in_parts/100-image-check

@@ -0,0 +1,628 @@
+#!/bin/bash
+
+# DigitalOcean Marketplace Image Validation Tool
+# © 2021-2022 DigitalOcean LLC.
+# This code is licensed under Apache 2.0 license (see LICENSE.md for details)
+
+VERSION="v. 1.8.1"
+RUNDATE=$(date)
+
+# Script should be run with SUDO
+if [ "$EUID" -ne 0 ]; then
+  echo "[Error] - This script must be run with sudo or as the root user."
+  exit 1
+fi
+
+STATUS=0
+PASS=0
+WARN=0
+FAIL=0
+
+# $1 == command to check for
+# returns: 0 == true, 1 == false
+cmdExists() {
+  if command -v "$1" >/dev/null 2>&1; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function getDistro {
+  if [ -f /etc/os-release ]; then
+    # freedesktop.org and systemd
+    . /etc/os-release
+    OS=$NAME
+    VER=$VERSION_ID
+  elif type lsb_release >/dev/null 2>&1; then
+    # linuxbase.org
+    OS=$(lsb_release -si)
+    VER=$(lsb_release -sr)
+  elif [ -f /etc/lsb-release ]; then
+    # For some versions of Debian/Ubuntu without lsb_release command
+    . /etc/lsb-release
+    OS=$DISTRIB_ID
+    VER=$DISTRIB_RELEASE
+  elif [ -f /etc/debian_version ]; then
+    # Older Debian/Ubuntu/etc.
+    OS=Debian
+    VER=$(cat /etc/debian_version)
+  elif [ -f /etc/SuSe-release ]; then
+    # Older SuSE/etc.
+    :
+  elif [ -f /etc/redhat-release ]; then
+    # Older Red Hat, CentOS, etc.
+    VER=$(cut -d" " -f3 </etc/redhat-release | cut -d "." -f1)
+    d=$(cut -d" " -f1 </etc/redhat-release | cut -d "." -f1)
+    if [[ $d == "CentOS" ]]; then
+      OS="CentOS Linux"
+    fi
+  else
+    # Fall back to uname, e.g. "Linux <version>", also works for BSD, etc.
+    OS=$(uname -s)
+    VER=$(uname -r)
+  fi
+}
+function loadPasswords {
+  SHADOW=$(cat /etc/shadow)
+}
+
+function checkAgent {
+  # Check for the presence of the DO directory in the filesystem
+  if [ -d /opt/digitalocean ]; then
+    echo -en "\e[41m[FAIL]\e[0m DigitalOcean directory detected.\n"
+    ((FAIL++))
+    STATUS=2
+    if [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]] || [[ $OS == "AlmaLinux" ]]; then
+      echo "To uninstall the agent: 'sudo yum remove droplet-agent'"
+      echo "To remove the DO directory: 'find /opt/digitalocean/ -type d -empty -delete'"
+    elif [[ $OS == "Ubuntu" ]] || [[ $OS == "Debian" ]]; then
+      echo "To uninstall the agent and remove the DO directory: 'sudo apt-get purge droplet-agent'"
+    fi
+  else
+    echo -en "\e[32m[PASS]\e[0m DigitalOcean Monitoring agent was not found\n"
+    ((PASS++))
+  fi
+}
+
+function checkLogs {
+  cp_ignore="/var/log/cpanel-install.log"
+  echo -en "\nChecking for log files in /var/log\n\n"
+  # Check if there are log archives or log files that have not been recently cleared.
+  for f in /var/log/*-????????; do
+    [[ -e $f ]] || break
+    if [ "${f}" != "${cp_ignore}" ]; then
+      echo -en "\e[93m[WARN]\e[0m Log archive ${f} found; Contents:\n"
+      cat "${f}"
+      ((WARN++))
+      if [[ $STATUS != 2 ]]; then
+        STATUS=1
+      fi
+    fi
+  done
+  for f in /var/log/*.[0-9]; do
+    [[ -e $f ]] || break
+    echo -en "\e[93m[WARN]\e[0m Log archive ${f} found; Contents:\n"
+    cat "${f}"
+    ((WARN++))
+    if [[ $STATUS != 2 ]]; then
+      STATUS=1
+    fi
+  done
+  for f in /var/log/*.log; do
+    [[ -e $f ]] || break
+    if [[ "${f}" = '/var/log/lfd.log' && "$(grep -E -v '/var/log/messages has been reset| Watching /var/log/messages' "${f}" | wc -c)" -gt 50 ]]; then
+      if [ "${f}" != "${cp_ignore}" ]; then
+        echo -en "\e[93m[WARN]\e[0m un-cleared log file, ${f} found; Contents:\n"
+        cat "${f}"
+        ((WARN++))
+        if [[ $STATUS != 2 ]]; then
+          STATUS=1
+        fi
+      fi
+    elif [[ "${f}" != '/var/log/lfd.log' && "$(wc -c <"${f}")" -gt 50 ]]; then
+      if [ "${f}" != "${cp_ignore}" ]; then
+        echo -en "\e[93m[WARN]\e[0m un-cleared log file, ${f} found; Contents:\n"
+        cat "${f}"
+        ((WARN++))
+        if [[ $STATUS != 2 ]]; then
+          STATUS=1
+        fi
+      fi
+    fi
+  done
+}
+function checkTMP {
+  # Check the /tmp directory to ensure it is empty.  Warn on any files found.
+  if [[ -n "$(ls -A /tmp)" ]]; then
+    echo -en "\e[93m[WARN]\e[0m /tmp directory is not empty; Contents\n"
+    ls -A /tmp
+    ((WARN++))
+    return 1
+  fi
+
+  echo -en "\e[32m[PASS]\e[0m /tmp directory is empty\n"
+  return 0
+}
+function checkRoot {
+  user="root"
+  uhome="/root"
+  for usr in $SHADOW; do
+    IFS=':' read -r -a u <<<"$usr"
+    if [[ "${u[0]}" == "${user}" ]]; then
+      if [[ ${u[1]} == "!" ]] || [[ ${u[1]} == "!!" ]] || [[ ${u[1]} == "*" ]]; then
+        echo -en "\e[32m[PASS]\e[0m User ${user} has no password set.\n"
+        ((PASS++))
+      else
+        echo -en "\e[41m[FAIL]\e[0m User ${user} has a password set on their account.\n"
+        ((FAIL++))
+        STATUS=2
+      fi
+    fi
+  done
+  if [ -d ${uhome}/ ]; then
+    if [ -d ${uhome}/.ssh/ ]; then
+      if ls ${uhome}/.ssh/* >/dev/null 2>&1; then
+        for key in "${uhome}"/.ssh/*; do
+          if [ "${key}" == "${uhome}/.ssh/authorized_keys" ]; then
+
+            if [ "$(wc -c <"${key}")" -gt 50 ]; then
+              echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a populated authorized_keys file in \e[93m${key}\e[0m\n"
+              akey=$(cat "${key}")
+              echo "File Contents:"
+              echo "$akey"
+              echo "--------------"
+              ((FAIL++))
+              STATUS=2
+            fi
+          elif [ "${key}" == "${uhome}/.ssh/id_rsa" ]; then
+            if [ "$(wc -c <"${key}")" -gt 0 ]; then
+              echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a private key file in \e[93m${key}\e[0m\n"
+              akey=$(cat "${key}")
+              echo "File Contents:"
+              echo "$akey"
+              echo "--------------"
+              ((FAIL++))
+              STATUS=2
+            else
+              echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has empty private key file in \e[93m${key}\e[0m\n"
+              ((WARN++))
+              if [[ $STATUS != 2 ]]; then
+                STATUS=1
+              fi
+            fi
+          elif [ "${key}" != "${uhome}/.ssh/known_hosts" ]; then
+            echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a file in their .ssh directory at \e[93m${key}\e[0m\n"
+            ((WARN++))
+            if [[ $STATUS != 2 ]]; then
+              STATUS=1
+            fi
+          else
+            if [ "$(wc -c <"${key}")" -gt 50 ]; then
+              echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a populated known_hosts file in \e[93m${key}\e[0m\n"
+              ((WARN++))
+              if [[ $STATUS != 2 ]]; then
+                STATUS=1
+              fi
+            fi
+          fi
+        done
+      else
+        echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m has no SSH keys present\n"
+      fi
+    else
+      echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have an .ssh directory\n"
+    fi
+    if [ -f /root/.bash_history ]; then
+
+      BH_S=$(wc -c </root/.bash_history)
+
+      if [[ $BH_S -lt 200 ]]; then
+        echo -en "\e[32m[PASS]\e[0m ${user}'s Bash History appears to have been cleared\n"
+        ((PASS++))
+      else
+        echo -en "\e[41m[FAIL]\e[0m ${user}'s Bash History should be cleared to prevent sensitive information from leaking\n"
+        ((FAIL++))
+        STATUS=2
+      fi
+
+      return 1
+    else
+      echo -en "\e[32m[PASS]\e[0m The Root User's Bash History is not present\n"
+      ((PASS++))
+    fi
+  else
+    echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have a directory in /home\n"
+  fi
+  echo -en "\n\n"
+  return 1
+}
+
+function checkUsers {
+  # Check each user-created account
+  awk -F: '$3 >= 1000 && $1 != "nobody" {print $1}' </etc/passwd | while IFS= read -r user; do
+    # Skip some other non-user system accounts
+    if [[ $user == "centos" ]]; then
+      :
+    elif [[ $user == "nfsnobody" ]]; then
+      :
+    else
+      echo -en "\nChecking user: ${user}...\n"
+      for usr in $SHADOW; do
+        IFS=':' read -r -a u <<<"$usr"
+        if [[ "${u[0]}" == "${user}" ]]; then
+          if [[ ${u[1]} == "!" ]] || [[ ${u[1]} == "!!" ]] || [[ ${u[1]} == "*" ]]; then
+            echo -en "\e[32m[PASS]\e[0m User ${user} has no password set.\n"
+            ((PASS++))
+          else
+            echo -en "\e[41m[FAIL]\e[0m User ${user} has a password set on their account. Only system users are allowed on the image.\n"
+            ((FAIL++))
+            STATUS=2
+          fi
+        fi
+      done
+      #echo "User Found: ${user}"
+      uhome="/home/${user}"
+      if [ -d "${uhome}/" ]; then
+        if [ -d "${uhome}/.ssh/" ]; then
+          if ls "${uhome}/.ssh/*" >/dev/null 2>&1; then
+            for key in "${uhome}"/.ssh/*; do
+              if [ "${key}" == "${uhome}/.ssh/authorized_keys" ]; then
+                if [ "$(wc -c <"${key}")" -gt 50 ]; then
+                  echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a populated authorized_keys file in \e[93m${key}\e[0m\n"
+                  akey=$(cat "${key}")
+                  echo "File Contents:"
+                  echo "$akey"
+                  echo "--------------"
+                  ((FAIL++))
+                  STATUS=2
+                fi
+              elif [ "${key}" == "${uhome}/.ssh/id_rsa" ]; then
+                if [ "$(wc -c <"${key}")" -gt 0 ]; then
+                  echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a private key file in \e[93m${key}\e[0m\n"
+                  akey=$(cat "${key}")
+                  echo "File Contents:"
+                  echo "$akey"
+                  echo "--------------"
+                  ((FAIL++))
+                  STATUS=2
+                else
+                  echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has empty private key file in \e[93m${key}\e[0m\n"
+                  ((WARN++))
+                  if [[ $STATUS != 2 ]]; then
+                    STATUS=1
+                  fi
+                fi
+              elif [ "${key}" != "${uhome}/.ssh/known_hosts" ]; then
+
+                echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a file in their .ssh directory named \e[93m${key}\e[0m\n"
+                ((WARN++))
+                if [[ $STATUS != 2 ]]; then
+                  STATUS=1
+                fi
+
+              else
+                if [ "$(wc -c <"${key}")" -gt 50 ]; then
+                  echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a known_hosts file in \e[93m${key}\e[0m\n"
+                  ((WARN++))
+                  if [[ $STATUS != 2 ]]; then
+                    STATUS=1
+                  fi
+                fi
+              fi
+
+            done
+          else
+            echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m has no SSH keys present\n"
+          fi
+        else
+          echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have an .ssh directory\n"
+        fi
+      else
+        echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have a directory in /home\n"
+      fi
+
+      # Check for an uncleared .bash_history for this user
+      if [ -f "${uhome}/.bash_history" ]; then
+        BH_S=$(wc -c <"${uhome}/.bash_history")
+
+        if [[ $BH_S -lt 200 ]]; then
+          echo -en "\e[32m[PASS]\e[0m ${user}'s Bash History appears to have been cleared\n"
+          ((PASS++))
+        else
+          echo -en "\e[41m[FAIL]\e[0m ${user}'s Bash History should be cleared to prevent sensitive information from leaking\n"
+          ((FAIL++))
+          STATUS=2
+
+        fi
+        echo -en "\n\n"
+      fi
+    fi
+  done
+}
+function checkFirewall {
+
+  if [[ $OS == "Ubuntu" ]]; then
+    fw="ufw"
+    ufwa=$(ufw status | head -1 | sed -e "s/^Status:\ //")
+    if [[ $ufwa == "active" ]]; then
+      FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+      ((PASS++))
+    else
+      FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+      ((WARN++))
+    fi
+  elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]] || [[ $OS == "AlmaLinux" ]]; then
+    if [ -f /usr/lib/systemd/system/csf.service ]; then
+      fw="csf"
+      if [[ $(systemctl status $fw >/dev/null 2>&1) ]]; then
+
+        FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+        ((PASS++))
+      elif cmdExists "firewall-cmd"; then
+        if [[ $(systemctl is-active firewalld >/dev/null 2>&1 && echo 1 || echo 0) ]]; then
+          FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+          ((PASS++))
+        else
+          FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+          ((WARN++))
+        fi
+      else
+        FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+        ((WARN++))
+      fi
+    else
+      fw="firewalld"
+      if [[ $(systemctl is-active firewalld >/dev/null 2>&1 && echo 1 || echo 0) ]]; then
+        FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+        ((PASS++))
+      else
+        FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+        ((WARN++))
+      fi
+    fi
+  elif [[ "$OS" =~ Debian.* ]]; then
+    # user could be using a number of different services for managing their firewall
+    # we will check some of the most common
+    if cmdExists 'ufw'; then
+      fw="ufw"
+      ufwa=$(ufw status | head -1 | sed -e "s/^Status:\ //")
+      if [[ $ufwa == "active" ]]; then
+        FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+        ((PASS++))
+      else
+        FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+        ((WARN++))
+      fi
+    elif cmdExists "firewall-cmd"; then
+      fw="firewalld"
+      if [[ $(systemctl is-active --quiet $fw) ]]; then
+        FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+        ((PASS++))
+      else
+        FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+        ((WARN++))
+      fi
+    else
+      # user could be using vanilla iptables, check if kernel module is loaded
+      fw="iptables"
+      if lsmod | grep -q '^ip_tables' 2>/dev/null; then
+        FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
+        ((PASS++))
+      else
+        FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
+        ((WARN++))
+      fi
+    fi
+  fi
+
+}
+function checkUpdates {
+  if [[ $OS == "Ubuntu" ]] || [[ "$OS" =~ Debian.* ]]; then
+    # Ensure /tmp exists and has the proper permissions before
+    # checking for security updates
+    # https://github.com/digitalocean/marketplace-partners/issues/94
+    if [[ ! -d /tmp ]]; then
+      mkdir /tmp
+    fi
+    chmod 1777 /tmp
+
+    echo -en "\nUpdating apt package database to check for security updates, this may take a minute...\n\n"
+    apt-get -y update >/dev/null
+
+    uc=$(apt-get --just-print upgrade | grep -i "security" -c)
+    if [[ $uc -gt 0 ]]; then
+      update_count=$((uc / 2))
+    else
+      update_count=0
+    fi
+
+    if [[ $update_count -gt 0 ]]; then
+      echo -en "\e[41m[FAIL]\e[0m There are ${update_count} security updates available for this image that have not been installed.\n"
+      echo -en
+      echo -en "Here is a list of the security updates that are not installed:\n"
+      sleep 2
+      apt-get --just-print upgrade | grep -i security | awk '{print $2}' | awk '!seen[$0]++'
+      echo -en
+      ((FAIL++))
+      STATUS=2
+    else
+      echo -en "\e[32m[PASS]\e[0m There are no pending security updates for this image.\n\n"
+      ((PASS++))
+    fi
+  elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]] || [[ $OS == "AlmaLinux" ]]; then
+    echo -en "\nChecking for available security updates, this may take a minute...\n\n"
+
+    update_count=$(yum check-update --security --quiet | wc -l)
+    if [[ $update_count -gt 0 ]]; then
+      echo -en "\e[41m[FAIL]\e[0m There are ${update_count} security updates available for this image that have not been installed.\n"
+      ((FAIL++))
+      STATUS=2
+    else
+      echo -en "\e[32m[PASS]\e[0m There are no pending security updates for this image.\n"
+      ((PASS++))
+    fi
+  else
+    echo "Error encountered"
+    exit 1
+  fi
+
+  return 1
+}
+function checkCloudInit {
+
+  if hash cloud-init 2>/dev/null; then
+    CI="\e[32m[PASS]\e[0m Cloud-init is installed.\n"
+    ((PASS++))
+  else
+    CI="\e[41m[FAIL]\e[0m No valid verison of cloud-init was found.\n"
+    ((FAIL++))
+    STATUS=2
+  fi
+  return 1
+}
+
+clear
+echo "DigitalOcean Marketplace Image Validation Tool ${VERSION}"
+echo "Executed on: ${RUNDATE}"
+echo "Checking local system for Marketplace compatibility..."
+
+getDistro
+
+echo -en "\n\e[1mDistribution:\e[0m ${OS}\n"
+echo -en "\e[1mVersion:\e[0m ${VER}\n\n"
+
+ost=0
+osv=0
+
+if [[ $OS == "Ubuntu" ]]; then
+  ost=1
+  if [[ $VER == "22.10" ]] || [[ $VER == "22.04" ]] || [[ $VER == "20.04" ]] || [[ $VER == "18.04" ]] || [[ $VER == "16.04" ]]; then
+    osv=1
+  fi
+
+elif [[ "$OS" =~ Debian.* ]]; then
+  ost=1
+  case "$VER" in
+    9)
+      osv=1
+      ;;
+    10)
+      osv=1
+      ;;
+    11)
+      osv=1
+      ;;
+    *)
+      osv=2
+      ;;
+  esac
+
+elif [[ $OS == "CentOS Linux" ]]; then
+  ost=1
+  if [[ $VER == "8" ]]; then
+    osv=1
+  elif [[ $VER == "7" ]]; then
+    osv=1
+  elif [[ $VER == "6" ]]; then
+    osv=1
+  else
+    osv=2
+  fi
+elif [[ $OS == "CentOS Stream" ]]; then
+  ost=1
+  if [[ $VER == "8" ]]; then
+    osv=1
+  else
+    osv=2
+  fi
+elif [[ $OS == "Rocky Linux" ]]; then
+  ost=1
+  if [[ $VER =~ 8\. ]]; then
+    osv=1
+  else
+    osv=2
+  fi
+elif [[ $OS == "AlmaLinux" ]]; then
+  ost=1
+  if [[ "$VERSION" =~ 8.* ]] || [[ "$VERSION" =~ 9.* ]]; then
+    osv=1
+  else
+    osv=2
+  fi
+else
+  ost=0
+fi
+
+if [[ $ost == 1 ]]; then
+  echo -en "\e[32m[PASS]\e[0m Supported Operating System Detected: ${OS}\n"
+  ((PASS++))
+else
+  echo -en "\e[41m[FAIL]\e[0m ${OS} is not a supported Operating System\n"
+  ((FAIL++))
+  STATUS=2
+fi
+
+if [[ $osv == 1 ]]; then
+  echo -en "\e[32m[PASS]\e[0m Supported Release Detected: ${VER}\n"
+  ((PASS++))
+elif [[ $ost == 1 ]]; then
+  echo -en "\e[41m[FAIL]\e[0m ${OS} ${VER} is not a supported Operating System Version\n"
+  ((FAIL++))
+  STATUS=2
+else
+  echo "Exiting..."
+  exit 1
+fi
+
+checkCloudInit
+
+echo -en "${CI}"
+
+checkFirewall
+
+echo -en "${FW_VER}"
+
+checkUpdates
+
+loadPasswords
+
+checkLogs
+
+echo -en "\n\nChecking all user-created accounts...\n"
+checkUsers
+
+echo -en "\n\nChecking the root account...\n"
+checkRoot
+
+echo -en "\n\nChecking the /tmp directory...\n"
+checkTMP
+
+checkAgent
+
+# Summary
+echo -en "\n\n---------------------------------------------------------------------------------------------------\n"
+
+if [[ $STATUS == 0 ]]; then
+  echo -en "Scan Complete.\n\e[32mAll Tests Passed!\e[0m\n"
+elif [[ $STATUS == 1 ]]; then
+  echo -en "Scan Complete. \n\e[93mSome non-critical tests failed.  Please review these items.\e[0m\e[0m\n"
+else
+  echo -en "Scan Complete. \n\e[41mOne or more tests failed.  Please review these items and re-test.\e[0m\n"
+fi
+echo "---------------------------------------------------------------------------------------------------"
+echo -en "\e[1m${PASS} Tests PASSED\e[0m\n"
+echo -en "\e[1m${WARN} WARNINGS\e[0m\n"
+echo -en "\e[1m${FAIL} Tests FAILED\e[0m\n"
+echo -en "---------------------------------------------------------------------------------------------------\n"
+
+if [[ $STATUS == 0 ]]; then
+  echo -en "We did not detect any issues with this image. Please be sure to manually ensure that all software installed on the base system is functional, secure and properly configured (or facilities for configuration on first-boot have been created).\n\n"
+  exit 0
+elif [[ $STATUS == 1 ]]; then
+  echo -en "Please review all [WARN] items above and ensure they are intended or resolved.  If you do not have a specific requirement, we recommend resolving these items before image submission\n\n"
+  exit 0
+else
+  echo -en "Some critical tests failed.  These items must be resolved and this scan re-run before you submit your image to the DigitalOcean Marketplace.\n\n"
+  exit 1
+fi

contrib/images/digitalocean/packer.pkr.hcl

@@ -0,0 +1,70 @@
+packer {
+  required_plugins {
+    digitalocean = {
+      version = ">= 1.0.4"
+      source  = "github.com/digitalocean/digitalocean"
+    }
+  }
+}
+
+variable "dokku_version" {
+  type    = string
+}
+
+source "digitalocean" "ubuntu" {
+  image         = "ubuntu-22-04-x64"
+  region        = "nyc1"
+  size          = "s-1vcpu-512mb-10gb"
+  ssh_username  = "root"
+  snapshot_name = "dokku-${var.dokku_version}-snapshot-{{timestamp}}"
+}
+
+build {
+  name = "dokku"
+  sources = [
+    "source.digitalocean.ubuntu"
+  ]
+
+  provisioner "shell" {
+    inline = [
+      "echo '--> Waiting until cloud-init is complete'",
+      "/usr/bin/cloud-init status --wait",
+    ]
+  }
+
+  provisioner "file" {
+    source      = "${path.root}/files/etc/"
+    destination = "/etc/"
+  }
+
+  provisioner "file" {
+    source      = "${path.root}/files/var/"
+    destination = "/var/"
+  }
+
+  provisioner "shell" {
+    environment_vars = [
+      "DOKKU_VERSION=${var.dokku_version}",
+      "DEBIAN_FRONTEND=noninteractive",
+      "LC_ALL=C",
+      "LANG=en_US.UTF-8",
+      "LC_CTYPE=en_US.UTF-8",
+    ]
+
+    scripts = [
+      "${path.root}/in_parts/011-docker",
+      "${path.root}/in_parts/011-ssh-message",
+      "${path.root}/in_parts/012-dokku-packages",
+      "${path.root}/in_parts/012-grub-opts",
+      "${path.root}/in_parts/014-docker-dns",
+      "${path.root}/in_parts/014-ufw-rules",
+      "${path.root}/in_parts/099-application_tag",
+      "${path.root}/in_parts/099-cleanup",
+      "${path.root}/in_parts/100-image-check",
+    ]
+  }
+
+  post-processor "manifest" {
+    output = "digitalocean-manifest.json"
+  }
+}

contrib/packer.json

@@ -1,32 +0,0 @@
-{
-  "builders": [
-    {
-      "type": "digitalocean",
-      "region": "nyc3",
-      "image": "ubuntu-14-04-x64"
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "file",
-      "source": "deb.mk",
-      "destination": "/tmp/Makefile"
-    },
-    {
-      "type": "shell",
-      "inline": [
-        "echo '--> Waiting 30 seconds for core services to be available'",
-        "sleep 30",
-
-        "echo '--> Updating apt repositories'",
-        "sudo apt-get update -qq >/dev/null",
-
-        "echo '--> Installing make requirement'",
-        "sudo apt-get -qq -y --no-install-recommends install build-essential",
-
-        "cd /tmp && make install-from-deb",
-        "rm /root/.ssh/authorized_keys"
-      ]
-    }
-  ]
-}

contrib/release-dokku

@@ -9,19 +9,16 @@ readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
-  # shellcheck disable=SC2034
   declare desc="Log info formatter"
   echo "$*"
 }
 
 log-error() {
-  # shellcheck disable=SC2034
   declare desc="Log error formatter"
   echo "!   $*" 1>&2
 }
 
 log-fail() {
-  # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
   exit 1
@@ -134,11 +131,10 @@ fn-publish-package() {
   local OS_ID ex
 
   [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
-  [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
   [[ "$RELEASE_TYPE" == "raspbian" ]] && DIST=raspbian
 
   if [[ "$RELEASE_TYPE" == "raspbian" ]]; then
-    OS_IDS=("buster")
+    OS_IDS=("buster" "bullseye")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing deb to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -148,7 +144,7 @@ fn-publish-package() {
       fi
     done
   elif [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("bionic" "focal")
+    OS_IDS=("bionic" "focal" "jammy")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -159,7 +155,7 @@ fn-publish-package() {
     done
 
     DIST=debian
-    OS_IDS=("stretch" "buster" "bullseye")
+    OS_IDS=("buster" "bullseye" "bookworm")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -187,8 +183,12 @@ fn-replace-version() {
 
 fn-repo-merged-requests() {
   declare desc="Retrieves all pull request ids since a given release of dokku"
-  declare TAG="$1"
-  git log "v${TAG}..HEAD" --oneline | grep "Merge pull request" | cut -d' ' -f 5 | cut -d '#' -f2
+  declare TAG="$1" IS_PATCH="$2"
+  if [[ "$IS_PATCH" == "true" ]]; then
+    git log "v${TAG}..HEAD" --oneline | grep "Merge pull request" | cut -d' ' -f 5 | cut -d '#' -f2
+  else
+    curl -u "$RELEASE_GITHUB_USERNAME:$RELEASE_GITHUB_API_TOKEN" --fail -sS "https://api.github.com/search/issues?q=repo:dokku/dokku+milestone:v${NEXT_VERSION}+is:pr&per_page=100" | jq '.items[].number'
+  fi
 }
 
 fn-repo-push-tags() {
@@ -205,7 +205,7 @@ fn-repo-push-tags() {
 
 fn-repo-update() {
   declare desc="Updates files within the repository for a given release"
-  declare IS_RELEASE="$1" CURRENT_VERSION="$2" NEXT_VERSION="$3"
+  declare IS_RELEASE="$1" CURRENT_VERSION="$2" NEXT_VERSION="$3" IS_PATCH="$4"
 
   log-info "(release-dokku) Replacing ${CURRENT_VERSION} with ${NEXT_VERSION}"
   for f in plugins/*/plugin.toml; do
@@ -224,7 +224,7 @@ fn-repo-update() {
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/style.css
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/development/release-process.md
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/install/docker.md
-  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation/index.md
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/home.html
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md
@@ -242,24 +242,34 @@ fn-repo-update() {
   fi
 
   log-info "(release-dokku) Adding HISTORY.md, committing and tagging"
-  fn-repo-update-history-and-commit "$CURRENT_VERSION" "$NEXT_VERSION"
+  fn-repo-update-history-and-commit "$CURRENT_VERSION" "$NEXT_VERSION" "$IS_PATCH"
   git tag "v${NEXT_VERSION}"
 }
 
 fn-repo-update-history-and-commit() {
   declare desc="Updates the history file and commits the changes"
-  declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
+  declare CURRENT_VERSION="$1" NEXT_VERSION="$2" IS_PATCH="$3"
   local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
-  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BC_BREAK HISTORY_REFACTOR HISTORY_BUG HISTORY_OTHER HISTORY_TESTS ISSUE_FILE
+  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_BUG HISTORY_DEPENDENCY HISTORY_DEPRECATION HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BC_BREAK HISTORY_REFACTOR HISTORY_REMOVAL HISTORY_OTHER HISTORY_TESTS ISSUE_FILE
 
   pushd "$ROOT_DIR" >/dev/null
 
   mkdir -p /tmp/github-data
 
-  for PULL_REQUEST_ID in $(fn-repo-merged-requests "$CURRENT_VERSION"); do
+  for PULL_REQUEST_ID in $(fn-repo-merged-requests "$CURRENT_VERSION" "$IS_PATCH"); do
     ISSUE_FILE="/tmp/github-data/${PULL_REQUEST_ID}.json"
     if [[ ! -f "$ISSUE_FILE" ]]; then
-      curl -sS "https://api.github.com/repos/dokku/dokku/issues/${PULL_REQUEST_ID}" >"$ISSUE_FILE"
+      while true; do
+        if OUTPUT=$(curl -u "$RELEASE_GITHUB_USERNAME:$RELEASE_GITHUB_API_TOKEN" --fail -sS "https://api.github.com/repos/dokku/dokku/issues/${PULL_REQUEST_ID}" 2>&1); then
+          echo "$OUTPUT" >"$ISSUE_FILE"
+          break
+        fi
+
+        log-error "Error while fetching info for pull/$PULL_REQUEST_ID, sleeping for 5 seconds"
+        log-error "$OUTPUT"
+        sleep 5
+        log-info "    Retrying pull/$PULL_REQUEST_ID"
+      done
     fi
 
     TITLE="$(jq -r '.title' "$ISSUE_FILE")"
@@ -267,16 +277,24 @@ fn-repo-update-history-and-commit() {
     TYPE="$(jq -r '.labels[] | select( .name | contains("type") ) | .name' "$ISSUE_FILE" | cut -d' ' -f2)"
     CHANGELOG_TEXT="- #${PULL_REQUEST_ID}: @${AUTHOR} ${TITLE}"
 
-    if [[ "$TYPE" == "bc-break" ]]; then
+    if [[ "$TYPE" == "release" ]]; then
+      continue
+    elif [[ "$TYPE" == "bc-break" ]]; then
       HISTORY_BC_BREAK="${HISTORY_BC_BREAK}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "bug" ]]; then
       HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "dependencies" ]]; then
+      HISTORY_DEPENDENCY="${HISTORY_DEPENDENCY}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "deprecation" ]]; then
+      HISTORY_DEPRECATION="${HISTORY_DEPRECATION}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "documentation" ]]; then
       HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "enhancement" ]]; then
       HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "refactor" ]]; then
       HISTORY_REFACTOR="${HISTORY_REFACTOR}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "removal" ]]; then
+      HISTORY_REMOVAL="${HISTORY_REMOVAL}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "tests" ]]; then
       HISTORY_TESTS="${HISTORY_TESTS}"$'\n'"$CHANGELOG_TEXT"
     else
@@ -288,7 +306,7 @@ fn-repo-update-history-and-commit() {
   HISTORY="${HISTORY}"$'\n\n'"## ${NEXT_VERSION}"
   HISTORY="${HISTORY}"$'\n\n'"Install/update via the bootstrap script:"
   HISTORY="${HISTORY}"$'\n\n'"\`\`\`shell"
-  HISTORY="${HISTORY}"$'\n'"wget https://raw.githubusercontent.com/dokku/dokku/v${NEXT_VERSION}/bootstrap.sh"
+  HISTORY="${HISTORY}"$'\n'"wget -NP . https://dokku.com/install/v${NEXT_VERSION}/bootstrap.sh"
   HISTORY="${HISTORY}"$'\n'"sudo DOKKU_TAG=v${NEXT_VERSION} bash bootstrap.sh"
   HISTORY="${HISTORY}"$'\n'"\`\`\`"
 
@@ -311,6 +329,16 @@ fn-repo-update-history-and-commit() {
     HISTORY="${HISTORY}"$'\n'"$HISTORY_ENHANCEMENT"
   fi
 
+  if [[ "$HISTORY_REMOVAL" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Removals"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_REMOVAL"
+  fi
+
+  if [[ "$HISTORY_DEPRECATION" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Deprecations"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_DEPRECATION"
+  fi
+
   if [[ "$HISTORY_REFACTOR" ]]; then
     HISTORY="${HISTORY}"$'\n\n'"### Refactors"
     HISTORY="${HISTORY}"$'\n'"$HISTORY_REFACTOR"
@@ -326,6 +354,11 @@ fn-repo-update-history-and-commit() {
     HISTORY="${HISTORY}"$'\n'"$HISTORY_TESTS"
   fi
 
+  if [[ "$HISTORY_DEPENDENCY" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Dependencies"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_DEPENDENCY"
+  fi
+
   if [[ "$HISTORY_OTHER" ]]; then
     HISTORY="${HISTORY}"$'\n\n'"### Other"
     HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER"
@@ -350,13 +383,27 @@ fn-require-bin() {
 
 fn-build-docker-image() {
   declare desc="Builds the dokku docker image and tags it with the given version"
-  declare VERSION="$1"
-  docker build -t "dokku/dokku:$VERSION" .
+  declare VERSION="$1" IS_RELEASE="$2"
+
+  if [[ "$IS_RELEASE" == "true" ]]; then
+    docker buildx build \
+      --platform linux/arm,linux/arm64,linux/amd64 \
+      --progress plain \
+      --push \
+      --tag "dokku/dokku:latest" \
+      --tag "dokku/dokku:$VERSION" .
+  elif [[ "$SKIP_IMAGE_BUILD" != "true" ]]; then
+    docker buildx build \
+      --platform linux/arm,linux/arm64,linux/amd64 \
+      --progress plain \
+      --tag "dokku/dokku:latest" \
+      --tag "dokku/dokku:$(echo "$VERSION" | tr + -)" .
+  fi
 }
 
 main() {
   declare RELEASE="$1"
-  local CURRENT_VERSION NEXT_VERSION IS_RELEASE
+  local CURRENT_VERSION NEXT_VERSION IS_PATCH IS_RELEASE
   local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build")
 
   if [[ "$RELEASE" == '--trace' ]]; then
@@ -387,36 +434,38 @@ main() {
   NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
+  IS_PATCH="false"
+  if [[ "$RELEASE" == "patch" ]]; then
+    IS_PATCH="true"
+  fi
+
   echo "v${NEXT_VERSION}" >build/next-version
 
-  fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
+  fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION" "$IS_PATCH"
   fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
   fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_armhf.deb" || log-fail "Error extracting deb package"
+  fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_arm64.deb" || log-fail "Error extracting deb package"
   fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
-  fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
-  cp -f "build/dokku_${NEXT_VERSION}_amd64.deb" build/dokku.deb
+  mkdir -p build/package
+  cp -f "build/dokku_${NEXT_VERSION}_amd64.deb" build/package/dokku-amd64.deb
+  cp -f "build/dokku_${NEXT_VERSION}_arm64.deb" build/package/dokku-arm64.deb
+  cp -f "build/dokku_${NEXT_VERSION}_armhf.deb" build/package/dokku-armhf.deb
 
   if [[ "$RELEASE" != "build" ]]; then
     fn-publish-package "$IS_RELEASE" "raspbian" "build/dokku_${NEXT_VERSION}_armhf.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "deb" "build/dokku_${NEXT_VERSION}_arm64.deb" || log-fail "Error publishing deb package"
     fn-publish-package "$IS_RELEASE" "deb" "build/dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
-    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
-    fn-build-docker-image "$NEXT_VERSION" || log-fail "Error building docker image"
+    fn-build-docker-image "$NEXT_VERSION" "$IS_RELEASE" || log-fail "Error building docker image"
 
-    if [[ "$IS_RELEASE" == "true" ]]; then
-      docker tag "dokku/dokku:$NEXT_VERSION" "dokku/dokku:latest"
-      docker push "dokku/dokku:$NEXT_VERSION"
-      docker push "dokku/dokku:latest"
-    fi
     fn-repo-push-tags "$IS_RELEASE"
+  else
+    fn-build-docker-image "$NEXT_VERSION" "$IS_RELEASE" || log-fail "Error building docker image"
   fi
 
   if [[ "$IS_RELEASE" != "true" ]]; then
     git reset -q HEAD plugins/*/plugin.toml
     git checkout -- plugins/*/plugin.toml
   fi
-
-  echo "build/dokku_${NEXT_VERSION}_amd64.deb" >build/deb-filename
-  echo "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" >build/rpm-filename
 }
 
 main "$@"

contrib/release-plugin

@@ -7,19 +7,16 @@ readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXXXX")"
 trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
-  # shellcheck disable=SC2034
   declare desc="Log info formatter"
   echo "$*"
 }
 
 log-error() {
-  # shellcheck disable=SC2034
   declare desc="Log error formatter"
   echo "!   $*" 1>&2
 }
 
 log-fail() {
-  # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
   exit 1

contrib/sort-mkdocs-versions

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+import json
+
+
+def main():
+    version_file = "tmp/docs-build/versions.json"
+    data = []
+    with open(version_file) as f:
+        data = json.load(f)
+
+    versions = []
+    for info in data:
+        if info["title"] == "latest":
+            continue
+        versions.append(info["title"].removeprefix("v"))
+
+    versions.sort(key=lambda x: list(map(int, x.split('.'))), reverse=True)
+    data = [
+        {
+            "aliases": ["latest"],
+            "title": "latest",
+            "version": "docs",
+        }
+    ]
+
+    for version in versions:
+        data.append({
+            "aliases": [],
+            "title": f"v{version}",
+            "version": f"docs~v{version}",
+        })
+
+    with open(version_file, "w") as f:
+        json.dump(data, f, indent=4)
+
+
+if __name__ == "__main__":
+    main()

contrib/write-mkdocs

@@ -0,0 +1,456 @@
+#!/usr/bin/env python
+import os
+import pathlib
+import shutil
+import sys
+from collections.abc import Callable
+
+import yaml
+
+from bs4 import BeautifulSoup
+
+
+def get_nav_from_selector(soup: BeautifulSoup, selector: str, docs_dir: str):
+    """
+    Generates navigation from template file
+    """
+    navigation = []
+    header_name = ""
+    for anchor in soup.select(selector):
+        classes = anchor.get("class", [])
+        if classes is None:
+            continue
+
+        if "disabled" in classes:
+            header_name = anchor.text
+            navigation.append({header_name: []})
+
+        href = anchor.get("href", "")
+        if href is None:
+            continue
+
+        href = str(href)
+        if href == "#":
+            continue
+
+        url = href.replace("{{NAME}}", "")
+        filename = url.replace("http://progrium.viewdocs.io/dokku/", "")
+        filename = filename.replace("http://dokku.viewdocs.io/dokku/", "")
+        filename = filename.strip("/") + ".md"
+        filename = filename.removeprefix("dokku/")
+
+        ignore_errors_for = [
+            "getting-started/installation.md",
+            "getting-started/upgrading.md",
+        ]
+        if not os.path.exists(docs_dir + "/" + filename):
+            if filename not in ignore_errors_for:
+                print("error fetching markdown file:", filename)
+                continue
+
+        for nav in navigation:
+            if header_name in nav:
+                if filename == "getting-started/installation.md":
+                    child_dir = "getting-started/install/"
+                    children = os.listdir(docs_dir + "/" + child_dir)
+                    children = [child_dir + c for c in children]
+                    children.sort()
+                    children.insert(0, "getting-started/advanced-installation.md")
+                    if os.path.exists(docs_dir + "/" + filename):
+                        children.insert(0, filename)
+                    else:
+                        children.insert(0, "getting-started/installation/index.md")
+                    nav[header_name].append(
+                        {
+                            "Getting Started with Dokku": children,
+                        }
+                    )
+                    continue
+
+                if filename == "getting-started/upgrading.md":
+                    child_dir = "appendices/"
+                    children = os.listdir(docs_dir + "/" + child_dir)
+
+                    children.sort(
+                        key=lambda x: list(map(int, x.split("-")[0].split("."))),
+                        reverse=True,
+                    )
+                    children = [child_dir + c for c in children]
+                    if os.path.exists(docs_dir + "/" + filename):
+                        children.insert(0, filename)
+                    else:
+                        children.insert(0, "getting-started/upgrading/index.md")
+                    nav[header_name].append(
+                        {
+                            "Upgrading": children,
+                        }
+                    )
+                    continue
+
+                nav[header_name].append(filename)
+    return navigation
+
+
+def generate_nav(src: str, dest: str) -> None:
+    """
+    Writes out navigation information to the mkdocs yaml file
+    """
+    navigation = []
+    repo_dir = pathlib.Path(__file__).parent.parent.resolve()
+    docs_dir = str(repo_dir) + "/docs"
+    with open(docs_dir + "/template.html", encoding="utf-8") as response:
+        soup = BeautifulSoup(response, "html.parser")
+        selectors = [
+            ".container .row .list-group a",
+            ".container-fluid .row .list-group a",
+        ]
+        for selector in selectors:
+            navigation = get_nav_from_selector(soup, selector, docs_dir)
+            if len(navigation) > 0:
+                break
+
+        if len(navigation) == 0:
+            print("No navigation found")
+            sys.exit(1)
+
+    with open(src, encoding="utf-8") as handler:
+        data = yaml.unsafe_load(handler)
+        data["nav"] = [
+            {"Docs": navigation},
+            {"Pro": "https://pro.dokku.com/docs/getting-started/"},
+            {"Blog": "https://dokku.com/blog/"},
+            {"Tutorials": "https://dokku.com/tutorials/"},
+            {
+                "Purchase Dokku Pro": "https://dokku.dpdcart.com/cart/add?product_id=217344&method_id=236878"
+            },
+        ]
+
+    with open(dest, mode="wt", encoding="utf-8") as handler:
+        yaml.dump(data, handler)
+
+
+def modify_content_noop(lines: list[str], _) -> tuple[list[str], bool]:
+    """
+    Simply returns the lines as is
+    """
+    modified = False
+    updated_lines = []
+    for line in lines:
+        updated_lines.append(line)
+    return updated_lines, modified
+
+
+def modify_content_links(lines: list[str], filename: str) -> tuple[list[str], bool]:
+    """
+    Modifies links to be relative instead of absolute
+    """
+    filename = filename.replace("/usr/src/source/docs/", "")
+    parts = filename.split("/")
+    parts.pop()
+    replacement = "](" + "/".join([".." for _ in parts]) + "/"
+    modified = False
+    updated_lines = []
+    for line in lines:
+        if "](/docs/" in line:
+            line = line.replace("](/docs/", replacement)
+            modified = True
+
+        updated_lines.append(line)
+    return updated_lines, modified
+
+
+def modify_content_stripspace(lines: list[str], _) -> tuple[list[str], bool]:
+    """
+    Removes trailing whitespace from each line
+    """
+    modified = False
+    updated_lines = []
+    for line in lines:
+        line = line.rstrip()
+        updated_lines.append(line)
+    return updated_lines, modified
+
+
+def modify_content_inject_newlines(lines: list[str], _) -> tuple[list[str], bool]:
+    """
+    Ensures every line has a trailing newline character
+    """
+    modified = False
+    updated_lines = []
+    for line in lines:
+        updated_lines.append(line.rstrip() + "\n")
+    return updated_lines, modified
+
+
+def is_github_new(line: str, next_line: str | None) -> bool:
+    """
+    Checks if a given line is a github "new as of" admonition
+    """
+    if not next_line:
+        return False
+
+    return line.startswith("> [!IMPORTANT]") and "new as of" in next_line.lower()
+
+
+def is_github_note(line: str) -> bool:
+    """
+    Checks if a given line is a github "note" admonition
+    """
+    return line.startswith("> [!NOTE]")
+
+
+def is_github_warning(line: str) -> bool:
+    """
+    Checks if a given line is a github "warning" admonition
+    """
+    return line.startswith("> [!WARNING]")
+
+
+def is_info(line: str) -> bool:
+    """
+    Checks if a given line is an "info" admonition
+    """
+    return line.startswith("> ")
+
+
+def is_new(line: str) -> bool:
+    """
+    Checks if a given line is a "new as of" admonition
+    """
+    return line.startswith("> ") and "new as of" in line.lower()
+
+
+def is_note(line: str) -> bool:
+    """
+    Checks if a given line is a "note" admonition
+    """
+    return line.startswith("> Note:")
+
+
+def is_warning(line: str) -> bool:
+    """
+    Checks if a given line is a "warning" admonition
+    """
+    return line.startswith("> Warning:")
+
+
+def modify_content_admonition(lines: list[str], _) -> tuple[list[str], bool]:
+    """
+    Applies adminition info to each line in the output
+    """
+    modified = False
+    updated_lines = []
+    admonition_lines = []
+    is_admonition = False
+    replace_new_in_next_line = False
+    for index, line in enumerate(lines):
+        next_line: str | None = None
+        if index + 1 < len(lines):
+            next_line = lines[index + 1]
+
+        if replace_new_in_next_line:
+            line = line.replace("New as of", "Introduced in")
+            line = line.replace("new as of", "introduced in")
+            replace_new_in_next_line = False
+
+        if is_github_new(line, next_line):
+            line = line.replace("> [!IMPORTANT]", '!!! tip "New"')
+            is_admonition = True
+            admonition_lines.append(line)
+            admonition_lines.append("")
+            replace_new_in_next_line = True
+        elif is_github_note(line):
+            line = line.replace("> [!NOTE]", '!!! note "Note"')
+            is_admonition = True
+            admonition_lines.append(line)
+            admonition_lines.append("")
+        elif is_github_warning(line):
+            line = line.replace("> [!WARNING]", '!!! warning "Warning"')
+            is_admonition = True
+            admonition_lines.append(line)
+            admonition_lines.append("")
+        elif is_new(line):
+            print("is_new")
+            line = line.replace("> ", '!!! tip "New"\n\n    ')
+            line = line.replace("New as of", "Introduced in")
+            line = line.replace("new as of", "introduced in")
+            is_admonition = True
+            admonition_lines.append(line)
+        elif is_note(line):
+            print("is_note")
+            line = line.replace("> Note: ", '!!! note "Note"\n\n    ')
+            is_admonition = True
+            admonition_lines.append(line)
+        elif is_warning(line):
+            print("is_warning")
+            line = line.replace("> Warning: ", '!!! warning "Warning"\n\n    ')
+            is_admonition = True
+            admonition_lines.append(line)
+        elif is_info(line):
+            if not is_admonition:
+                line = line.replace("> ", '!!! info "Info"\n\n    ')
+            elif line in [">", "> "]:
+                line = ""
+            else:
+                line = "    " + line.removeprefix("> ")
+            is_admonition = True
+            admonition_lines.append(line)
+        elif is_admonition and line in [">", "> "]:
+            line = ""
+            admonition_lines.append(line)
+        elif is_admonition and line.startswith("> "):
+            line = "    " + line.removeprefix("> ")
+            admonition_lines.append(line)
+        elif line == "":
+            is_admonition = False
+            if len(admonition_lines) > 0:
+                modified = True
+                updated_lines.extend(admonition_lines)
+                admonition_lines = []
+            updated_lines.append("")
+        else:
+            updated_lines.append(line)
+    return updated_lines, modified
+
+
+def is_shell_codeblock_start(line: str) -> bool:
+    """
+    Checks to see if a line starts a codeblock
+    """
+    return line == "```shell"
+
+
+def modify_content_terminal_example(lines: list[str], _) -> tuple[list[str], bool]:
+    """
+    Modifies content so that terminal output is shown appropriately
+    """
+    modified = False
+    updated_lines = []
+    command_block = []
+    example_block = []
+    in_command_block = False
+    in_example_block = False
+    previous_block = ""
+    next_line_must_be = None
+    for line in lines:
+        if is_shell_codeblock_start(line):
+            command_block.append(line)
+            modified = True
+            in_command_block = True
+            continue
+        elif in_command_block:
+            command_block.append(line)
+            if line == "```":
+                in_command_block = False
+                previous_block = "command_block"
+                next_line_must_be = ""
+            continue
+        elif line == "```":
+            if previous_block == "":
+                updated_lines.append(line)
+                continue
+            if previous_block == "command_block":
+                example_block.append(line)
+
+                if in_example_block:
+                    previous_block = ""
+                    in_example_block = False
+                    updated_lines.append('=== "Shell"')
+                    updated_lines.append("")
+                    for command_line in command_block:
+                        updated_lines.append(f"    {command_line}")
+                    command_block = []
+
+                    updated_lines.append("")
+                    updated_lines.append('=== "Output"')
+                    updated_lines.append("")
+                    for example_line in example_block:
+                        updated_lines.append(f"    {example_line}")
+                    example_block = []
+                else:
+                    in_example_block = True
+                continue
+        elif previous_block == "command_block":
+            if next_line_must_be is None:
+                if in_example_block:
+                    example_block.append(line)
+                else:
+                    updated_lines.extend(command_block)
+                    updated_lines.append("")
+                    updated_lines.append(line)
+                    command_block = []
+                    previous_block = ""
+                continue
+            if next_line_must_be == "":
+                if line == "":
+                    next_line_must_be = None
+                    continue
+
+        updated_lines.append(line)
+
+    if len(command_block) > 0:
+        updated_lines.extend(command_block)
+
+    return updated_lines, modified
+
+
+def update_markdown(src):
+    """
+    Updates all markdown files to be mkdocs compatible
+    """
+    markdown_files = []
+    allowed_extensions = [".md"]
+    for subdir, _, files in os.walk(src):
+        for file in files:
+            ext = os.path.splitext(file)[-1].lower()
+            file_path = os.path.join(subdir, file)
+            if ext in allowed_extensions:
+                markdown_files.append(file_path)
+
+    modifiers: list[Callable[[list[str], str], tuple[list[str], bool]]] = [
+        modify_content_noop,
+        modify_content_links,
+        modify_content_stripspace,
+        modify_content_admonition,
+        modify_content_terminal_example,
+        modify_content_inject_newlines,
+    ]
+
+    for file in markdown_files:
+        is_modified = False
+        lines = []
+        with open(file, "r", encoding="utf-8") as handler:
+            lines = handler.readlines()
+            for modifier in modifiers:
+                lines, modified = modifier(lines, file)
+                if modified:
+                    is_modified = True
+
+        if is_modified:
+            with open(file, "w", encoding="utf-8") as handler:
+                handler.writelines(lines)
+
+
+def main():
+    """
+    Main command that performs doc manipulation
+    """
+    print("----> Copying mkdocs.yml")
+    print("      Generating navigation")
+    generate_nav("/usr/src/source/mkdocs.yml", "/usr/src/app/mkdocs.yml")
+
+    print("----> Copying docs folder")
+    update_markdown(
+        "/usr/src/source/docs",
+    )
+
+    if os.path.exists("/usr/src/app/docs"):
+        print("      Removing old docs folder")
+        shutil.rmtree("/usr/src/app/docs")
+
+    print("      Performing copy")
+    shutil.copytree("/usr/src/source/docs", "/usr/src/app/docs")
+
+
+if __name__ == "__main__":
+    main()

deb.mk

@@ -19,8 +19,8 @@ install-from-deb:
 	wget -nv -O - https://get.docker.com/ | sh
 
 	@echo "--> Installing dokku"
-	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
-	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "bionic") main" | sudo tee /etc/apt/sources.list.d/dokku.list
+	wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "focal") main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq >/dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install dokku
 
@@ -49,4 +49,4 @@ endif
 	cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
 	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
 	dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
-	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" || true

debian/config

@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
-  # shellcheck disable=SC1091
   . /usr/share/debconf/confmodule
 fi
 

debian/control

@@ -1,11 +1,11 @@
 Package: dokku
-Version: 0.26.8
+Version: 0.31.2
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.12.0), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-image-labeler (>= 0.2.2), net-tools, netrc, software-properties-common, parallel, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip
-Recommends: herokuish (>= 0.3.4), bash-completion, dokku-update, dokku-event-listener
-Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python3, debconf
+Depends: apache2-utils, locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.17.1), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-compose-plugin | moby-compose, docker-container-healthchecker (>= 0.6.4), docker-image-labeler (>= 0.6.1), lambda-builder (>= 0.5.0), net-tools, netrc (>= 0.7.1), software-properties-common, parallel, procfile-util (>= 0.16.0), python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip
+Recommends: herokuish (>= 0.7.1), bash-completion, dokku-update, dokku-event-listener
+Pre-Depends: gliderlabs-sigil (>= 0.10.1), nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python3, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
  Dokku is an extensible, open source Platform as a Service

debian/postinst

@@ -3,12 +3,10 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
-  # shellcheck disable=SC1091
   . /usr/share/debconf/confmodule
 fi
 
 if [[ -r /etc/default/dokku ]]; then
-  # shellcheck disable=SC1091
   source /etc/default/dokku
 fi
 
@@ -111,6 +109,7 @@ dpkg-handling() {
       db_get "dokku/hostname"
       echo "Setting VHOST contents to $RET"
       echo "$RET" >"${DOKKU_ROOT}/VHOST"
+      chown dokku:dokku "${DOKKU_ROOT}/VHOST"
     fi
   fi
 
@@ -125,8 +124,7 @@ dpkg-handling() {
 case "$1" in
   abort-upgrade | abort-remove | abort-deconfigure) ;;
 
-  \
-    configure)
+  configure)
     mandb
     [ ! -x /usr/bin/docker.io ] || ln -sf /usr/bin/docker.io /usr/local/bin/docker
     if [[ -f /sbin/modprobe ]]; then

debian/postrm

@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
-  # shellcheck disable=SC1091
   . /usr/share/debconf/confmodule
 fi
 

debian/preinst

@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
-  # shellcheck disable=SC1091
   . /usr/share/debconf/confmodule
 fi
 
@@ -22,11 +21,9 @@ case "$1" in
 
   upgrade) ;;
 
-  \
-    abort-upgrade) ;;
+  abort-upgrade) ;;
 
-  \
-    *)
+  *)
     echo "preinst called with unknown argument \`$1'" >&2
     exit 1
     ;;

docker/etc/my_init.d/10_dokku_init

@@ -3,15 +3,20 @@ set -eo pipefail
 
 log-info() {
   declare desc="Log info formatter"
-  echo "    $*" 1>&2
+  echo "       $*" 1>&2
 }
 
 log-fail() {
   declare desc="Log fail formatter"
-  echo "!   $*" 1>&2
+  echo " !     $*" 1>&2
   exit 1
 }
 
+log-warn() {
+  declare desc="Log fail formatter"
+  echo " !     $*" 1>&2
+}
+
 support-userns() {
   chown 0:0 /usr/bin/sudo
   chmod 4755 /usr/bin/sudo
@@ -31,23 +36,32 @@ main() {
     mkdir -p /mnt/dokku
   fi
 
-  directories=("/etc/ssh" "/home/dokku" "/var/lib/dokku/config" "/var/lib/dokku/data")
+  directories=("/etc/ssh" "/home/dokku" "/var/lib/dokku/config" "/var/lib/dokku/data" "/var/lib/dokku/services")
   for dir in "${directories[@]}"; do
     if [[ ! -e "$dir" ]]; then
       log-info "Copying ${dir} skel into place"
       mkdir -p "/mnt/dokku${dir}"
-      rsync -a "/skel${dir}/" "${dir}/" || log-fail "Unable to copy ${dir} skel into place"
+      if [[ -d "/skel${dir}" ]]; then
+        rsync -a "/skel${dir}/" "${dir}/" || log-fail "Unable to copy ${dir} skel into place"
+      fi
     fi
 
     # chown mount directories to "dokku:dokku"
-    if [[ "$dir" != "/etc/ssh" ]]; then
+    if [[ "$dir" == "/var/lib/dokku/services" ]]; then
+      chown dokku:dokku /var/lib/dokku/services
+    elif [[ "$dir" != "/etc/ssh" ]]; then
       find "$dir" -print0 | xargs -0 chown -h dokku:dokku
     fi
   done
 
   if [[ -f /mnt/dokku/plugin-list ]]; then
     while read line; do
-      dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
+      local plugin_name="$(echo "$line" | awk -F: '{print $1}')"
+      if dokku plugin:installed "$plugin_name"; then
+        log-warn "Skipping already installed plugin: $plugin_name"
+      else
+        dokku plugin:install "$(echo "$line" | awk -F': ' '{print $2}')" --name "$plugin_name"
+      fi
     done </mnt/dokku/plugin-list
   fi
 

docker/etc/sudoers.d/dokku-docker

@@ -1 +1 @@
-dokku    ALL=NOPASSWD:SETENV:/usr/bin/docker,/usr/bin/docker-image-labeler,/usr/bin/pack
+dokku    ALL=NOPASSWD:SETENV:/usr/bin/docker,/usr/bin/docker-container-healthchecker,/usr/bin/docker-image-labeler,/usr/bin/pack,/usr/bin/crontab

docker/usr/local/bin/docker-container-healthchecker

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $TRACE ]] && set -x
+
+main() {
+  declare desc="re-runs docker-container-healthchecker commands as sudo"
+  local DOCKER_CONTAINER_HEALTHCHECKER_BIN=""
+  if [[ -x "/usr/bin/docker-container-healthchecker" ]]; then
+    DOCKER_CONTAINER_HEALTHCHECKER_BIN="/usr/bin/docker-container-healthchecker"
+  fi
+
+  if [[ -z "$DOCKER_CONTAINER_HEALTHCHECKER_BIN" ]]; then
+    echo "!   No docker-container-healthchecker binary found" 1>&2
+    exit 1
+  fi
+
+  sudo -E "$DOCKER_CONTAINER_HEALTHCHECKER_BIN" "$@"
+}
+
+main "$@"

docs.mk

@@ -0,0 +1,19 @@
+.PHONY: docs-build-image
+docs-build-image:
+	docker build -f docs/_build/Dockerfile --progress plain -t app/mkdocs .
+
+.PHONY: docs-build
+docs-build:
+	@docker run --rm -p 3487:3487 -v "$(PWD):/usr/src/source" --name docs-serve app/mkdocs build
+
+.PHONY: docs-serve
+docs-serve:
+	docker run --rm -p 3487:3487 -v "$(PWD):/usr/src/source" --name docs-serve app/mkdocs serve
+
+.PHONY: docs-deps
+docs-deps:
+	@docker run --rm -p 3487:3487 -v "$(PWD):/usr/src/app" app/mkdocs deps
+
+.PHONY: docs-enter
+docs-enter:
+	docker exec -it docs-serve bash

docs/_build/Dockerfile

@@ -0,0 +1,12 @@
+FROM python:3.11.4-alpine
+
+WORKDIR /usr/src/app
+
+COPY docs/_build/requirements.txt .
+
+RUN apk add --no-cache bash build-base yaml && \
+  pip install --no-cache-dir -r requirements.txt
+
+COPY docs/_build/entrypoint /bin/entrypoint
+
+ENTRYPOINT [ "/bin/entrypoint" ]

docs/_build/app-nginx.conf.sigil

@@ -0,0 +1,26 @@
+worker_processes 1;
+error_log stderr;
+pid nginx.pid;
+daemon off;
+
+events {
+  worker_connections 768;
+}
+
+http {
+  types_hash_max_size 2048;
+  include mime.types;
+  charset UTF-8;
+  server {
+    listen {{ $.PORT }};
+    server_name  _;
+    root /app/www;
+    index index.html;
+    port_in_redirect off;
+
+    include /app/www/nginx.conf.d/*.conf;
+    location / {
+      try_files $uri $uri/ =404;
+    }
+  }
+}

docs/_build/entrypoint

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+write-mkdocs() {
+  if [[ -f /usr/src/source/contrib/write-mkdocs ]]; then
+    if ! python /usr/src/source/contrib/write-mkdocs; then
+      exit 0
+    fi
+  fi
+}
+
+main() {
+  declare CMD="$1" ARGS=("${@:2}")
+
+  if [[ "$CMD" == "build" ]]; then
+    write-mkdocs
+    echo "----> Executing mkdocs build"
+    mkdocs build
+    site_dir="$(grep site_dir mkdocs.yml | awk '{print $2}')"
+    cp -r "/usr/src/app/${site_dir}" "/usr/src/source/${site_dir}"
+
+    return $?
+  fi
+
+  if [[ "$CMD" == "deps" ]]; then
+    exec pip freeze
+  fi
+
+  if [[ "$CMD" == "serve" ]]; then
+    write-mkdocs
+    exec mkdocs serve -a 0.0.0.0:3487
+  fi
+
+  exec "$CMD" "${ARGS[@]}"
+}
+
+main "$@"

docs/_build/requirements.txt

@@ -0,0 +1,23 @@
+beautifulsoup4==4.12.2
+click==8.1.7
+ghp-import==2.1.0
+importlib-metadata==6.8.0
+Jinja2==3.1.2
+Markdown>=3.2.1,<3.5
+MarkupSafe==2.1.3
+mergedeep==1.3.4
+mkdocs==1.5.2
+mkdocs-exclude==1.0.2
+mkdocs-material==9.2.3
+mkdocs-material-extensions==1.1.1
+packaging==23.1
+Pygments==2.16.1
+pymdown-extensions==10.1
+pyparsing==3.1.1
+python-dateutil==2.8.2
+PyYAML==6.0.1
+pyyaml_env_tag==0.1
+six==1.16.0
+soupsieve==2.4.1
+watchdog==3.0.0
+zipp==3.16.2

docs/_overrides/main.html

@@ -0,0 +1,56 @@
+<!--
+  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+{% extends "base.html" %}
+
+<!-- Custom front matter -->
+{% block extrahead %}
+
+  <!-- Extra style sheets (can't be set in mkdocs.yml due to content hash) -->
+  <link
+    rel="stylesheet"
+    href="{{ 'overrides/assets/stylesheets/main.css' | url }}"
+  />
+{% endblock %}
+
+<!-- Announcement bar -->
+{% block announce %}
+  <a href="https://twitter.com/dokku">
+    For updates follow <strong>@dokku</strong> on
+    <span class="twemoji twitter">
+      {% include ".icons/fontawesome/brands/twitter.svg" %}
+    </span>
+    <strong>Twitter</strong>
+  </a>
+{% endblock %}
+
+<!-- Theme-related JavaScript -->
+{% block scripts %}
+  {{ super() }}
+
+  <!-- Extra JavaScript (can't be set in mkdocs.yml due to content hash) -->
+  <script src="{{ 'overrides/assets/javascripts/bundle.js' | url }}"></script>
+{% endblock %}
+
+{% block outdated %}
+  You're not viewing the latest version.
+  <a href="{{ page.abs_url }}">
+    <strong>Click here to go to latest.</strong>
+  </a>
+{% endblock %}

docs/advanced-usage/backup-recovery.md

@@ -6,7 +6,8 @@ The best plan for disaster recovery is to always keep multiple (remote) copies o
 
 ## TLDR
 
-> Warning: This method has many caveats. Please read this entire document before assuming these backups work as expected, and test your backups on a regular basis.
+> [!WARNING]
+> This method has many caveats. Please read this entire document before assuming these backups work as expected, and test your backups on a regular basis.
 
 ### Creating a backup
 

docs/advanced-usage/deployment-tasks.md

@@ -1,5 +1,6 @@
 # Deployment Tasks
 
+> [!IMPORTANT]
 > New as of 0.5.0
 
 ## Usage
@@ -17,30 +18,30 @@ To support this, Dokku provides support for a special `release` command within y
 Each "phase" has different expectations and limitations:
 
 - `app.json`: `scripts.dokku.predeploy`
-  - When to use: This should be used if your app does not support arbitrary build commands and you need to make changes to the built image.
-  - Are changes committed to the image at this phase: Yes
-  - Example use-cases
-    - Bundling assets in a slightly different way
-    - Installing a custom package from source or copying a binary into place
+    - When to use: This should be used if your app does not support arbitrary build commands and you need to make changes to the built image.
+    - Are changes committed to the image at this phase: Yes
+    - Example use-cases
+        - Bundling assets in a slightly different way
+        - Installing a custom package from source or copying a binary into place
 - `app.json`: `scripts.dokku.postdeploy`
-  - When to use: This should be used in conjunction with external systems to signal the completion of your deploy.
-  - Are changes committed to the image at this phase: No
-  - Example use-cases
-    - Notifying slack that your app is deployed
-    - Coordinating traffic routing with a central load balancer
+    - When to use: This should be used in conjunction with external systems to signal the completion of your deploy.
+    - Are changes committed to the image at this phase: No
+    - Example use-cases
+        - Notifying slack that your app is deployed
+        - Coordinating traffic routing with a central load balancer
 - `app.json`: `scripts.postdeploy`
-  - When to use: This should be used when you wish to run a command _once_, after the app is created and not on subsequent deploys to the app.
-  - Are changes committed to the image at this phase: No
-  - Example use-cases
-    - Setting up OAuth clients and DNS
-    - Loading seed/test data into the app’s test database
+    - When to use: This should be used when you wish to run a command _once_, after the app is created and not on subsequent deploys to the app.
+    - Are changes committed to the image at this phase: No
+    - Example use-cases
+        - Setting up OAuth clients and DNS
+        - Loading seed/test data into the app’s test database
 - `Procfile`: `release`
-  - When to use: This should be used in conjunction with external systems to signal the completion of your app image build.
-  - Are changes committed to the image at this phase: No
-  - Example use-cases
-    - Sending CSS, JS, and other assets from your app’s slug to a CDN or S3 bucket
-    - Priming or invalidating cache stores
-    - Running database migrations
+    - When to use: This should be used in conjunction with external systems to signal the completion of your app image build.
+    - Are changes committed to the image at this phase: No
+    - Example use-cases
+        - Sending CSS, JS, and other assets from your app’s slug to a CDN or S3 bucket
+        - Priming or invalidating cache stores
+        - Running database migrations
 
 Additionally, if using a Dockerfile with an `ENTRYPOINT`, the deployment task is passed to that entrypoint as is. The exceptions are if the entrypoint is one of the following:
 
@@ -57,8 +58,10 @@ Please keep the above in mind when utilizing deployment tasks.
 
 When deploying a monorepo, it may be desirable to specify the specific path of the `app.json` file to use for a given app. This can be done via the `app-json:set` command. If a value is specified and that file does not exist within the repository, Dokku will continue the build process as if the repository has no `app.json` file.
 
+For deploys via the `git:from-image` and `git:load-image` commands, the `app.json` is extracted from the configured `WORKDIR` property of the image. For all other deploys - git push, `git:from-archive`, `git:sync` - will have the `app.json` extracted directly from the source code. Both cases will respect the configured `appjson-path` property value.
+
 ```shell
-dokku app-json:set node-js-app appjson-path second-app.json
+dokku app-json:set node-js-app appjson-path .dokku/app.json
 ```
 
 The default value may be set by passing an empty value for the option:
@@ -81,6 +84,7 @@ dokku app-json:set --global appjson-path
 
 ### Displaying app-json reports for an app
 
+> [!IMPORTANT]
 > New as of 0.25.0
 
 You can get a report about the app's storage status using the `app-json:report` command:
@@ -137,9 +141,8 @@ Dokku provides limited support for the `app.json` manifest from Heroku (document
 - `scripts.dokku.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are _not_ committed at this phase.
 - `scripts.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are _not_ committed at this phase.
 
-For buildpack-based deployments, the location of the `app.json` file should be at the root of your repository. Dockerfile-based app deploys should have the `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`.
-
-> Warning: Any failed `app.json` deployment task will fail the deploy. In the case of either phase, a failure will not affect any running containers.
+> [!WARNING]
+> Any failed `app.json` deployment task will fail the deploy. In the case of either phase, a failure will not affect any running containers.
 
 The following is an example `app.json` file. Please note that only the `scripts.dokku.predeploy` and `scripts.dokku.postdeploy` tasks are supported by Dokku at this time. All other fields will be ignored and can be omitted.
 
@@ -157,6 +160,7 @@ The following is an example `app.json` file. Please note that only the `scripts.
 
 #### Procfile Release command
 
+> [!IMPORTANT]
 > New as of 0.14.0
 
 The `Procfile` also supports a special `release` command which acts in a similar way to the [Heroku Release Phase](https://devcenter.heroku.com/articles/release-phase). This command is executed _after_ an app's docker image is built, but _before_ any containers are scheduled. This is also run _after_ any command executed by `scripts.dokku.predeploy`.
@@ -169,4 +173,5 @@ release: curl https://some.external.api.service.com/deployment?state=built
 
 Unlike the `scripts.dokku.predeploy` command, changes made during by the `release` command are _not_ persisted to disk.
 
-> Warning: scaling the release command up will likely result in unspecified issues within your deployment, and is highly discouraged.
+> [!WARNING]
+> scaling the release command up will likely result in unspecified issues within your deployment, and is highly discouraged.

docs/advanced-usage/docker-options.md

@@ -1,5 +1,6 @@
 # Docker Container Options
 
+> [!IMPORTANT]
 > New as of 0.3.17
 
 Pass [container options](https://docs.docker.com/engine/reference/run/) to the `docker run` command  during Dokku's `build`, `deploy` and `run` phases
@@ -27,7 +28,7 @@ Dokku deploys your application in multiple "phases" and the `docker-options` plu
 
 Manipulation of docker options will not restart running containers. This enables multiple options to be set/unset before final application. As such, changing an app's docker options must be followed by a `dokku ps:rebuild` in order to take effect.
 
-More information on supported Docker options can be found here: https://docs.docker.com/engine/reference/commandline/run/.
+More information on supported Docker options can be found [here](https://docs.docker.com/engine/reference/commandline/run/).
 
 Container options configured via the `docker-options` plugin are not used to modify the process a container runs. Container options are the `[OPTIONS]` portion of the following, where `[CONTAINER_COMMAND]` and `[ARG]` are the process and the arguments passed to it that are launched in the created container: `docker run [OPTIONS] [CONTAINER_COMMAND] [ARG...]`. Please see the documentation for [customizing the run command](/docs/deployment/builders/dockerfiles.md#customizing-the-run-command) or use a [Procfile](/docs/deployment/builders/dockerfiles.md#procfiles-and-multiple-processes) to modify the command used by a Dockerfile-based container.
 
@@ -43,7 +44,8 @@ dokku docker-options:add node-js-app deploy "-v /var/log/node-js-app:/app/logs"
 dokku docker-options:add node-js-app run "-v /var/log/node-js-app:/app/logs"
 ```
 
-> Note: When [mounting a host directory](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) in a Dokku app you should first create that directory as user `dokku` and then mount the directory under `/app` in the container using `docker-options` as above. Otherwise the app will lack write permission in the directory.
+> [!NOTE]
+> When [mounting a host directory](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) in a Dokku app you should first create that directory as user `dokku` and then mount the directory under `/app` in the container using `docker-options` as above. Otherwise the app will lack write permission in the directory.
 
 ### Remove a Docker option
 
@@ -84,6 +86,7 @@ dokku docker-options:clear node-js-app build,run
 
 ### Displaying docker-options reports for an app
 
+> [!IMPORTANT]
 > New as of 0.8.1
 
 You can get a report about the app's docker-options status using the `docker-options:report` command:

docs/advanced-usage/event-logs.md

@@ -1,5 +1,6 @@
 # Dokku Event Logs
 
+> [!IMPORTANT]
 > New as of 0.3.21
 
 Docker provides an _events_ command to show system's real time events. Likewise, Dokku can record events as syslog entries and also provides a plugin to display the last ones.
@@ -33,7 +34,6 @@ dokku events
 Jul  3 16:09:48 dokku.me dokku[127630]: INVOKED: pre-release-buildpack( pythonapp )
 Jul  3 16:10:02 dokku.me dokku[128095]: INVOKED: docker-args-run( rubyapp )
 Jul  3 16:10:02 dokku.me dokku[128114]: INVOKED: docker-args-run( nhl )
-Jul  3 16:10:03 dokku.me dokku[128136]: INVOKED: post-release-buildpack( pythonapp )
 Jul  3 16:10:03 dokku.me dokku[128195]: INVOKED: pre-deploy( pythonapp )
 Jul  3 16:10:23 dokku.me dokku[129253]: INVOKED: docker-args-deploy( pythonapp )
 Jul  3 16:10:24 dokku.me dokku[129451]: INVOKED: check-deploy( pythonapp 6274ced0d4be11af4490cd18abaf77cdd593f025133f403d984e80d86a39acec web 5000 10.0.16.80 )
@@ -68,8 +68,6 @@ post-build-dockerfile
 post-delete
 post-deploy
 post-domains-update
-post-release-buildpack
-post-release-dockerfile
 pre-build-buildpack
 pre-build-dockerfile
 pre-delete
@@ -78,4 +76,4 @@ pre-release-buildpack
 pre-release-dockerfile
 receive-app
 update
-```
+```

docs/advanced-usage/persistent-storage.md

@@ -1,12 +1,13 @@
 # Persistent Storage
 
+> [!IMPORTANT]
 > New as of 0.5.0
 
 The preferred method to mount external containers to a Dokku managed container, is to use the Dokku storage plugin.
 
 ```
 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:list <app> [--format text|json]                # 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
@@ -21,18 +22,48 @@ The storage plugin supports the following mount points:
 
 ## Usage
 
+### Listing persistent storage
+
+Persistent storage bind mounts are specified on a per-app basis, and can be listed with the `storage:list` command:
+
+```shell
+dokku storage:list node-js-app
+```
+
+```
+-----> node-js-app volume bind-mounts:
+       /var/lib/dokku/data/storage/node-js-app:/app/storage
+```
+
+The output format can also be set to `json` for programmatic access:
+
+```shell
+dokku storage:list node-js-app --format json
+```
+
+```
+[
+  {
+    "host_path": "/var/lib/dokku/data/storage/node-js-app",
+    "container_path": "/app/storage",
+    "volume_options": ""
+  }
+]
+```
+
 ### Creating storage directories
 
+> [!IMPORTANT]
 > 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/dokku/data/storage` path - created during Dokku installation - and prepare it for use with an app.
 
 ```shell
-dokku storage:ensure-directory lollipop
+dokku storage:ensure-directory node-js-app
 ```
 
 ```
------> Ensuring /var/lib/dokku/data/storage/lollipop exists
+-----> Ensuring /var/lib/dokku/data/storage/node-js-app exists
        Setting directory ownership to 32767:32767
        Directory ready for mounting
 ```
@@ -40,16 +71,17 @@ dokku storage:ensure-directory lollipop
 By default, permissions are set for usage with Herokuish buildpacks. These permissions can be changed via the `--chown` option according to the following table:
 
 - `--chown herokuish` (default): Use `32767:32767` as the folder permissions.
-  - This is used for apps deployed with Buildpacks via Herokuish.
+    - 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.
+    - 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.
+    - 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.
+> [!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
 
@@ -95,6 +127,7 @@ dokku ps:restart app-name
 
 ### Displaying storage reports for an app
 
+> [!IMPORTANT]
 > New as of 0.8.1
 
 You can get a report about the app's storage status using the `storage:report` command:
@@ -165,14 +198,17 @@ dokku docker-options:add node-js-app build "-v /tmp/python-test:/opt/test"
 
 You cannot use mounted volumes during the build phase of a Dockerfile deploy. This is because Docker does not support volumes when executing `docker build`.
 
-> 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.
+> [!WARNING]
+> **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.
 
 ## App User and Persistent Storage file ownership (buildpack apps only)
 
+> [!IMPORTANT]
 > New as of 0.7.1
 
 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.
+> [!NOTE]
+> this user must exist in your herokuish image.
 
-Additionally, the default `docker-local` scheduler that comes with Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. See the [docker-local scheduler documentation](/docs/advanced-usage/schedulers/docker-local.md#disabling-chown-of-persistent-storage) docs for more information.
+Additionally, the default `docker-local` scheduler that comes with Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. See the [docker-local scheduler documentation](/docs/deployment/schedulers/docker-local.md#disabling-chown-of-persistent-storage) docs for more information.

docs/advanced-usage/plugin-management.md

@@ -1,17 +1,18 @@
 # Plugin Management
 
+> [!IMPORTANT]
 > New as of 0.4.0
 
 ```
 plugin:disable <name>                    # Disable an installed plugin (third-party only)
 plugin:enable <name>                     # Enable a previously disabled plugin
-plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]]           # Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
+plugin:install [--core|--git-url] [--committish branch|commit|tag] [--name custom-plugin-name]           # Optionally download git-url (and pin to the specified branch/commit/tag) & run install trigger for active plugins (or only core ones)
 plugin:installed <name>                  # Checks if a plugin is installed
 plugin:install-dependencies [--core]     # Run install-dependencies trigger for active plugins (or only core ones)
 plugin:list                              # Print active plugins
 plugin:trigger <args...>.                # Trigger an arbitrary plugin hook
 plugin:uninstall <name>                  # Uninstall a plugin (third-party only)
-plugin:update [name [committish]]        # Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
+plugin:update [name [branch|commit|tag]] # Optionally update named plugin from git (and pin to the specified branch/commit/tag) & run update trigger for active plugins
 ```
 
 ```shell
@@ -35,38 +36,39 @@ dokku plugin:list
 
 ```
 plugn: dev
-  00_dokku-standard    0.26.8 enabled    dokku core standard plugin
-  20_events            0.26.8 enabled    dokku core events logging plugin
-  app-json             0.26.8 enabled    dokku core app-json plugin
-  apps                 0.26.8 enabled    dokku core apps plugin
-  build-env            0.26.8 enabled    dokku core build-env plugin
-  buildpacks           0.26.8 enabled    dokku core buildpacks plugin
-  certs                0.26.8 enabled    dokku core certificate management plugin
-  checks               0.26.8 enabled    dokku core checks plugin
-  common               0.26.8 enabled    dokku core common plugin
-  config               0.26.8 enabled    dokku core config plugin
-  docker-options       0.26.8 enabled    dokku core docker-options plugin
-  domains              0.26.8 enabled    dokku core domains plugin
-  enter                0.26.8 enabled    dokku core enter plugin
-  git                  0.26.8 enabled    dokku core git plugin
-  logs                 0.26.8 enabled    dokku core logs plugin
-  network              0.26.8 enabled    dokku core network plugin
-  nginx-vhosts         0.26.8 enabled    dokku core nginx-vhosts plugin
-  plugin               0.26.8 enabled    dokku core plugin plugin
-  proxy                0.26.8 enabled    dokku core proxy plugin
-  ps                   0.26.8 enabled    dokku core ps plugin
-  repo                 0.26.8 enabled    dokku core repo plugin
-  resource             0.26.8 enabled    dokku core resource plugin
-  scheduler-docker-local 0.26.8 enabled    dokku core scheduler-docker-local plugin
-  shell                0.26.8 enabled    dokku core shell plugin
-  ssh-keys             0.26.8 enabled    dokku core ssh-keys plugin
-  storage              0.26.8 enabled    dokku core storage plugin
-  tags                 0.26.8 enabled    dokku core tags plugin
-  tar                  0.26.8 enabled    dokku core tar plugin
-  trace                0.26.8 enabled    dokku core trace plugin
+  00_dokku-standard    0.31.2 enabled    dokku core standard plugin
+  20_events            0.31.2 enabled    dokku core events logging plugin
+  app-json             0.31.2 enabled    dokku core app-json plugin
+  apps                 0.31.2 enabled    dokku core apps plugin
+  build-env            0.31.2 enabled    dokku core build-env plugin
+  buildpacks           0.31.2 enabled    dokku core buildpacks plugin
+  certs                0.31.2 enabled    dokku core certificate management plugin
+  checks               0.31.2 enabled    dokku core checks plugin
+  common               0.31.2 enabled    dokku core common plugin
+  config               0.31.2 enabled    dokku core config plugin
+  docker-options       0.31.2 enabled    dokku core docker-options plugin
+  domains              0.31.2 enabled    dokku core domains plugin
+  enter                0.31.2 enabled    dokku core enter plugin
+  git                  0.31.2 enabled    dokku core git plugin
+  logs                 0.31.2 enabled    dokku core logs plugin
+  network              0.31.2 enabled    dokku core network plugin
+  nginx-vhosts         0.31.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.31.2 enabled    dokku core plugin plugin
+  proxy                0.31.2 enabled    dokku core proxy plugin
+  ps                   0.31.2 enabled    dokku core ps plugin
+  repo                 0.31.2 enabled    dokku core repo plugin
+  resource             0.31.2 enabled    dokku core resource plugin
+  scheduler-docker-local 0.31.2 enabled    dokku core scheduler-docker-local plugin
+  shell                0.31.2 enabled    dokku core shell plugin
+  ssh-keys             0.31.2 enabled    dokku core ssh-keys plugin
+  storage              0.31.2 enabled    dokku core storage plugin
+  tags                 0.31.2 enabled    dokku core tags plugin
+  tar                  0.31.2 enabled    dokku core tar plugin
+  trace                0.31.2 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.
+> [!WARNING]
+> All plugin commands other than `plugin:list` and `plugin:help` require sudo access and must be run directly from the Dokku server.
 
 ### Checking if a plugin is installed
 
@@ -78,6 +80,9 @@ dokku plugin:installed postgres
 
 ### Installing a plugin
 
+> [!NOTE]
+> Plugins installed in this method within a [docker-based installation](/docs/getting-started/install/docker.md) of Dokku do not persist across installs. Please see the [plugin installation section](/docs/getting-started/install/docker.md#plugin-installation) of the docker-based installation docs for further details.
+
 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
 
 The most common usage is to install a plugin from a url. This url may be any of the following:
@@ -163,6 +168,12 @@ An optional commit SHA-like object may be specified.
 dokku plugin:update postgres 2.0.0
 ```
 
+Any future invocation of `plugin:update` will respect the previously specified SHA-like object. To follow a particular branch again, specify that branch:
+
+```shell
+dokku plugin:update postgres main
+```
+
 ### Uninstalling a plugin
 
 Third party plugins can be uninstalled using the `plugin:uninstall` command:

docs/advanced-usage/registry-management.md

@@ -1,5 +1,6 @@
 # Registry Management
 
+> [!IMPORTANT]
 > New as of 0.25.0
 
 ```
@@ -69,22 +70,22 @@ dokku registry:set --global server
 The following are the values that should be used for common remote servers:
 
 - Amazon Elastic Container Registry:
-  - value: `$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/`
-  - notes: The `$AWS_ACCOUNT_ID` and `$AWS_REGION` should match the values for your account and region, respectively. Additionally, an IAM profile that allows `push` access to the repository specified by `image-repo` should be attached to your Dokku server.
+    - value: `$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/`
+    - notes: The `$AWS_ACCOUNT_ID` and `$AWS_REGION` should match the values for your account and region, respectively. Additionally, an IAM profile that allows `push` access to the repository specified by `image-repo` should be attached to your Dokku server.
 - Azure Container Registry:
-  - value `$REGISTRY_NAME.azurecr.io/`
-  - notes: The `$AKS_REGISTRY_NAME` should match the name of the registry created on your account.
+    - value `$REGISTRY_NAME.azurecr.io/`
+    - notes: The `$AKS_REGISTRY_NAME` should match the name of the registry created on your account.
 - Docker Hub:
-  - value: `docker.io/`
-  - notes: Requires owning the namespace used in the `image-repo` value.
+    - value: `docker.io/`
+    - notes: Requires owning the namespace used in the `image-repo` value.
 - Digitalocean:
-  - value: `registry.digitalocean.com/`
-  - notes: Requires setting the correct `image-repo` value for your registry.
+    - value: `registry.digitalocean.com/`
+    - notes: Requires setting the correct `image-repo` value for your registry.
 - Github Container Registry:
-  - value: `ghcr.io/`
-  - notes: Requires that the authenticated user has access to the namespace used in the `image-repo` value.
+    - value: `ghcr.io/`
+    - notes: Requires that the authenticated user has access to the namespace used in the `image-repo` value.
 - Quay.io:
-  - value: `quay.io/`
+    - value: `quay.io/`
 
 ### Specifying an image repository name
 

docs/advanced-usage/repository-management.md

@@ -1,5 +1,6 @@
 # Repository Management
 
+> [!IMPORTANT]
 > New as of 0.6.0
 
 ```

docs/advanced-usage/resource-management.md

@@ -1,5 +1,6 @@
 # Resource Management
 
+> [!IMPORTANT]
 > New as of 0.15.0
 
 ```
@@ -16,7 +17,8 @@ The resource plugin is meant to allow users to limit or reserve resources for a
 
 By default, Dokku allows unlimited resource access to apps deployed on a server. In some cases, it may be desirable to limit this on a per-app or per-process-type basis. The `resource` plugin allows management of both resource "limits" and resource "reservations", where each resource request type has specific meaning to the scheduler in use for a given app.
 
-> Warning: The meaning of a values and it's units are specific to the scheduler in use for a given app. If a value is incorrect for a scheduler, this may result in containers failing to start correctly. If a scheduler does not support a given resource type combination, it will be ignored. All resource commands require an app rebuild or deploy in order to take effect.
+> [!WARNING]
+> The meaning of a values and it's units are specific to the scheduler in use for a given app. If a value is incorrect for a scheduler, this may result in containers failing to start correctly. If a scheduler does not support a given resource type combination, it will be ignored. All resource commands require an app rebuild or deploy in order to take effect.
 
 Valid resource options include:
 
@@ -28,7 +30,7 @@ Valid resource options include:
 - `--network-egress`
 - `--nvidia-gpu`
 
-See the [Supported Resource Management Properties](/docs/advanced-usage/schedulers/docker-local.md#supported-resource-management-properties) section of the docker local scheduler documentation for more information on how each resource limit maps to Docker.
+See the [Supported Resource Management Properties](/docs/deployment/schedulers/docker-local.md#supported-resource-management-properties) section of the docker local scheduler documentation for more information on how each resource limit maps to Docker.
 
 Resource limits and reservations are applied only during the `run` and `deploy` phases of an application, and will not impact the `build` phase of an application.
 

docs/appendices/0.10.0-migration-guide.md

@@ -4,10 +4,10 @@
 
 By default, Dokku will ship a PCI Compliant nginx configuration. For developers whose users are on older browsers or mobile devices, you may need to ship a custom `nginx.conf.sigil` to enable ciphers for older browsers.
 
-See the [nginx customization](/docs/configuration/nginx/#customizing-the-nginx-configuration) docs for more details.
+See the [nginx customization](/docs/networking/proxies/nginx.md#customizing-the-nginx-configuration) docs for more details.
 
 ## Nginx Error Pages
 
 We now ship with nicer error pages by default. You are free to customize your Dokku installation via a custom `nginx.conf.sigil` to change what error pages are displayed in different circumstances.
 
-See the [nginx customization](/docs/configuration/nginx/#customizing-the-nginx-configuration) docs for more details.
+See the [nginx customization](/docs/networking/proxies/nginx.md#customizing-the-nginx-configuration) docs for more details.

docs/appendices/0.21.0-migration-guide.md

@@ -8,7 +8,7 @@ The `tls` name is no longer a reserved app name, and can be used by applications
 
 - `git#git_deploy_branch()` is deprecated in favor of `plugn trigger git-deploy-branch`.
 - The `config` command is deprecated in favor of `config:show`.
-  - Usage of this command in conjunction with either the `--export` or `--shell` flag is deprecated in favor of `config:export --format` with the correct format value (`exports` or `shell`, respectively).
+    - Usage of this command in conjunction with either the `--export` or `--shell` flag is deprecated in favor of `config:export --format` with the correct format value (`exports` or `shell`, respectively).
 - The `nginx:build-config` command is deprecated in favor of `proxy:build-config`.
 
 ## Removals

docs/appendices/0.25.0-migration-guide.md

@@ -7,7 +7,9 @@ The [dokku-registry](https://github.com/dokku/dokku-registry) plugin is now buil
 - Builder plugins should call `post-release-builder` at the end of the build.
 - The `push` and `pull` command are not implemented. Users wishing to deploy a remote image should use `git:from-image`. Image pushing is not available at this time.
 - At this time, remote docker repositories are not automatically created for AWS, and users must create those repositories for their applications as necessary. This may be implemented in the future.
-- Docker images are only pushed when configured to do so. See the [registry management documentation](/docs/deployment/registry-management.md) for more details.
+- Docker images are only pushed when configured to do so. See the [registry management documentation](/docs/advanced-usage/registry-management.md) for more details.
+
+Before upgrading, uninstall the registry plugin via `dokku plugin:uninstall registry`. Not doing so will cause issues with Dokku.
 
 ## Other
 
@@ -17,7 +19,7 @@ The [dokku-registry](https://github.com/dokku/dokku-registry) plugin is now buil
 - The `dokku run` command now always removes the ephemeral container on exit. Users that need a persistent container should instead specify a `console` process type in their `Procfile` specifying an available shell (usually either `bash` or `sh`) and scale that container appropriately.
 - The `pre-deploy` plugin trigger is now called internally by Dokku. Scheduler plugins should avoid calling this trigger, as any image changes introduced by subsequent trigger calls will be ignored.
 - The default image used for Herokuish Buildpack builds is now `gliderlabs/herokuish:latest-20`, and is based on both the `heroku-20` stack as well as Ubuntu 20.04. Users that wish to stick with the old, `heroku-18`/Ubuntu 18.04 builder may specify `gliderlabs/herokuish:latest-18` as their builder image. Please see the [herokuish buildpack deployment documentation](/docs/deployment/builders/herokuish-buildpacks.md#customizing-the-buildpack-stack-builder) for more information on how to specify a custom buildpack stack builder.
-  - This change does not impact any users of Cloud Native Buildpacks.
+    - This change does not impact any users of Cloud Native Buildpacks.
 - We fixed an issue that required extracting Procfiles at the beginning of a deploy. Due to this change, a `Dockerfile` app contains a `Procfile` that does not specify a `web` process will fail to start. Usage of a `Procfile` with _only_ a `release` command should be replaced with a `scripts.dokku.postdeploy` deployment task in the `app.json` file. The alternative is to define the `web` process in the `Procfile`. See the [deployment task documentation](/docs/advanced-usage/deployment-tasks.md) for more information.
 
 ### Deprecations

docs/appendices/0.26.0-migration-guide.md

@@ -9,4 +9,4 @@
 
 - The `scheduler` plugin now controls the scheduler in use for deploys. Apps will have their `DOKKU_SCHEDULER` environment variables migrated to the scheduler plugin, after which that value will be removed from said app. Please see the [scheduler documentation](/docs/deployment/schedulers/scheduler-management.md) for more information.
 - The `deploy-source` metadata from `apps:report` is now no longer computed on the fly, but hydrated at deploy time via the `deploy-source-set` trigger. This value may be empty until your next deploy.
-  - Additionally, the `deploy-source` trigger has now been removed.
+    - Additionally, the `deploy-source` trigger has now been removed.

docs/appendices/0.27.0-migration-guide.md

@@ -0,0 +1,14 @@
+# 0.27.0 Migration Guide
+
+## Changes
+
+- Renaming an application will now only rename domains that are associated with global domains. As an example:
+
+    ```shell
+    dokku domains:set-global dokku.me
+    dokku apps:create node-js-app
+    dokku domains:set node-js-app node-js-app.dokku.me node-js-app.dokku.com
+    dokku apps:rename node-js-app other-name
+    dokku domains:report node-js-app --domains-app-vhosts
+    # output: other-name.dokku.me node-js-app.dokku.com
+    ```

docs/appendices/0.28.0-migration-guide.md

@@ -0,0 +1,25 @@
+# 0.28.0 Migration Guide
+
+## Removals
+
+Support for the following operating systems has been removed:
+
+- CentOS 7
+- Debian 9 (Stretch)
+- Fedora
+- OpenSuse
+
+Dokku will no longer provide packages for RPM based systems. Debian 9 users _may_ use new Debian packages, though support is not guaranteed.
+
+All users are encouraged to install Dokku via the [Docker-based installation method](/docs/getting-started/install/docker.md), or switch to a supported operating system.
+
+## Deprecations
+
+Ubuntu 18.04 is now a deprecated installation target. The operating system will be considered EOL by Canonical in April 2023. Users are encouraged to upgrade to Ubuntu 22.04 or consider switching their instllation method to the [Docker-based installation method](/docs/getting-started/install/docker.md) to avoid any disruption in usage.
+
+## Additions
+
+New in 0.28.0 are the Caddy, Haproxy and Traefik plugins. As community plugins wrapping these proxies exist, users should:
+
+- Recommended: Uninstall the community plugin in question and switch all config to the new plugins.
+- Upgrade the community plugin to a version that does not use the `proxy:set` value of `caddy`, `haproxy` or `traefik`.

docs/appendices/0.29.0-migration-guide.md

@@ -0,0 +1,19 @@
+# 0.29.0 Migration Guide
+
+## Changes
+
+- The output of `run:detached` now uses the container name - eg. `node-js-app.run.1` - vs the container id.
+- The ID of `cron` tasks is now base36-encoded instead of base64-encoded.
+- The `nginx.conf.sigil` is now extracted when source code is extracted for a build and not from the built image. Users can specify alternative paths via the `nginx-conf-sigil-path` property of the `nginx` plugin. See the [nginx documentation](/docs/networking/proxies/nginx.md#customizing-the-nginx-configuration) for more information on how to configure the `nginx.conf.sigil` path for your application.
+    - For deploys via `git:from-image`, the `nginx.conf.sigil` file will be extracted from the source image, respecting the value of `nginx-conf-sigil-path`.
+- The `Procfile` is now extracted when source code is extracted for a build and not from the built image. Users can specify alternative paths via the `procfile-path` property of the `ps` plugin. See the [process management documentation](/docs/processes/process-management.md#changing-the-procfile-location) for more information on how to configure the `Procfile` path for your application.
+    - For deploys via `git:from-image`, the `Procfile` file will be extracted from the source image, respecting the value of `procfile-path`.
+- The existing `pre-restore` hook has been renamed to `scheduler-pre-restore`. There is a new `pre-restore` hook that is triggered within the `ps:restore` command prior to restoring any apps.
+- Nginx init commands are now performed via systemctl on Ubuntu systems when `/usr/bin/systemctl` is available.
+
+## Removals
+
+- The `DOKKU_WAIT_TO_RETIRE` environment variable has been migrated to a `checks` property named `wait-to-retire` and will be ignored if set as an environment variable.
+- The `domains-setup` trigger has been removed. Initial app domains will now be automatically setup during app creation.
+- The `URLS` file containing generated urls for an app is no longer generated or referenced. Users should retrieve app urls via the new `domains-urls` plugin trigger.
+- The common function `get_app_urls` has been removed. Users should retrieve app urls via the new `domains-urls` plugin trigger.

docs/appendices/0.30.0-migration-guide.md

@@ -0,0 +1,41 @@
+# 0.30.0 Migration Guide
+
+> **Important**: Due to the removal of `DOKKU_SCALE` support, users with a version older than 0.25.x are heavily encouraged to upgrade to 0.29.x prior to 0.30.x. Not doing so will result in all app containers stopping on rebuild due to having no scale settings.
+
+## Deprecations
+
+- Support for Ubuntu 18.04 has been deprecated. Please upgrade your host OS in advance of the [End Of Life in April 2023](https://wiki.ubuntu.com/BionicBeaver/ReleaseNotes).
+
+## Changes
+
+- The `app.json` file is now extracted from the source code instead of the built image. For deploys via `git:from-image`, the file is extracted from the built image.
+
+## Removals
+
+- Support for [SPDY](https://en.wikipedia.org/wiki/SPDY) has been removed. No major browser supports it as of 2021. Custom `nginx.conf.sigil` templates referencing spdy-related variables will continue to build until the 1.0.0 release.
+- Support for the `DOKKU_SCALE` file - deprecated in 0.25.0 - has been removed in favor of the `formation` key in the `app.json` file. Please see the [process management documentation](/docs/processes/process-management.md#manually-managing-process-scaling) for more information on how to use the `formation` key of the `app.json` file.
+- The deprecated `--detach` global flag for `dokku run` was removed. Please see the [one-off tasks documentation](/docs/processes/one-off-tasks.md#running-a-detached-container) for more information on running detached containers.
+- The following deprecated trigger have been removed in favor of the `post-release-builder` trigger. See the [plugin triggers documentation](https://dokku.com/docs/development/plugin-triggers/#post-release-builder) for more details.
+    - `post-release-buildpack`
+    - `post-release-dockerfile`
+    - `post-release-pack`
+- The ability to call `logs:failed` without specifying an app or `--all` flag has been removed. This was deprecated in 0.22.0. Please see the [logs:failed](/docs/deployment/logs.md#failed-deploy-logs).
+- The following app shell functions - deprecated since 0.20.0 - have been removed in favor of their plugin trigger equivalents. Sourcing the `app/functions` file will fail going forward.
+    - `apps#apps_create()` is removed in favor of `plugn trigger app-create`.
+    - `apps#apps_destroy()` is removed in favor of `plugn trigger app-destroy`.
+    - `apps#apps_exists()` is removed in favor of `plugn trigger app-exists`.
+    - `apps#apps_maybe_create()` is removed in favor of `plugn trigger app-maybe-create`.
+- The following common shell functions have been removed:
+    - `common#is_container_running()` (deprecated since 0.12.6) is removed in favor of `common#is_container_status()`.
+    - `common#is_app_running()` (deprecated since 0.22.0) is removed in favor of `ps#fn-ps-is-app-running()`.
+- The global `--rm-container` and `--rm` flags - deprecated since 0.25.0 - have been removed.
+- The following git shell functions have been removed:
+    - `git#use_git_worktree()` (deprecated since 0.23.7) has been removed. There is no alternative as the function has been made internal.
+    - `git#git_deploy_branch()`(deprecated since 0.21.0) has been removed in favor of `plugn trigger git-deploy-branch`.
+- The following nginx commands - deprecated since 0.20.0 - have been removed:
+    - `nginx:show-conf` has been removed in favor of `nginx:show-config`.
+    - `nginx:validate` has been removed in favor of `nginx:validate-config`.
+    - `nginx:build-config` - deprecated since 0.21.0 - has been removed in favor of `proxy:build-config`.
+- The following proxy functions - deprecated since 0.20.0 - have been removed in favor of their plugin trigger equivalents. Sourcing the `proxy/functions` file will fail going forward.
+    - `proxy#is_app_proxy_enabled()` is removed in favor of `plugn trigger proxy-is-enabled`.
+    - `proxy#get_app_proxy_type()` is removed in favor of `plugn trigger proxy-type`.

docs/appendices/0.31.0-migration-guide.md

@@ -0,0 +1,36 @@
+# 0.31.0 Migration Guide
+
+## Changes
+
+- Herokuish build cache is now mounted from a docker volume - eg. `cache-node-js-app` - instead of the local filesystem. All existing app cache will be cleared upon upgrading past 0.29.0.
+- The `vector` container integration now mounts config to `/etc/vector` instead of the path `/etc/vector/vector.json`, allowing users the ability to provide extra configuration for Vector Sinks. To take advantage of the new functionality, the vector container should be stopped (via `dokku logs:vector-stop`) and then started (via `dokku logs:vector-start`).
+- The `traefik` integration now mounts config to `/data` instead of the path `/acme.json`, fixing permissions issues under certain architectures. To take advantage of the new functionality, the traefik container should be stopped (via `dokku traefik:stop`) and then started (via `dokku traefik:start`).
+- Users no longer need to clear the `source-image` git property when transitioning from image-based deploys (`git:from-image` and `git:load-image`) to other deployment methods (git push, `git:from-archive`, `git:sync`).
+- For deploys via the `git:from-image` and `git:load-image` commands, the `CHECKS` file is now extracted from the configured `WORKDIR` property of the image. For all other deploys - git push, `git:from-archive`, `git:sync` - will have the `CHECKS` extracted directly from the source code. The filename in both cases is `CHECKS` and cannot be modified.
+- Port mappings are now auto-detected during the build process. Users may override detected port mappings via the `ports` plugin. A default port mapping of `http:80:5000` will be used if none is otherwise specified.
+- Users building docker images that run Dokku will need to use a new sudoer wrapper for the `docker-container-healthchecker` binary to work correctly. A reference version has been placed in the `docker` skeleton directory. This should only impact platform developers, and users of our Docker image will already have the file available.
+- The default image used for Herokuish Buildpack builds is now `gliderlabs/herokuish:latest-22`, and is based on both the `heroku-22` stack as well as Ubuntu 22.04. Users that wish to stick with the old, `heroku-20`/Ubuntu 20.04 builder may specify `gliderlabs/herokuish:latest-20` as their builder image. Please see the [herokuish buildpack deployment documentation](/docs/deployment/builders/herokuish-buildpacks.md#customizing-the-buildpack-stack-builder) for more information on how to specify a custom buildpack stack builder.
+- The default image used for Cloud Native Buildpack builds is now `heroku/builder:22`, and is based on both the `heroku-22` stack as well as Ubuntu 22.04. Users that wish to stick with the old, `heroku-20`/Ubuntu 20.04 builder may specify `heroku/buildpacks:20` as their builder image. Please see the [herokuish buildpack deployment documentation](/docs/deployment/builders/herokuish-buildpacks.md#customizing-the-buildpack-stack-builder) for more information on how to specify a custom buildpack stack builder.
+
+## Deprecations
+
+- The `proxy:ports*` commands have been replaced with the new `ports` plugin. Users will be able to use the old `proxy:ports*` commands for a single minor release, and they will be removed in the next minor release.
+- The `common#get_available_port()` function has been deprecated and will be removed in the next release. Users should avoid interacting with this function and instead use the `ports-get-available` plugin trigger for fetching an available port.
+- The `proxy-configure-ports` plugin trigger has been deprecated and will be removed in the next release. Users should instead trigger the `ports-configure` plugin trigger.
+- The `common#get_dockerfile_exposed_ports()` function is deprecated and will be removed in the next release. There is no replacement for this as it's only use in Dokku core was in the `builder-dockerfile` plugin.
+- The `common#get_exposed_ports_from_image()` function is deprecated and will be removed in the next release. There is no replacement for this as it's only use in Dokku core was during the build process.
+- The environment variable `DOKKU_PROXY_PORT_MAP` has been migrated to the properties system. Direct changes to the value will be ignored, and users should interact with port maps via the `ports` plugin.
+- The `CHECKS` file is deprecated in favor of defining healthchecks in the `app.json` file. The [docker-container-healthchecker](https://github.com/dokku/docker-container-healthchecker) tool can be used to generate healthcheck entries in `app.json` format from existing `CHECKS` files. See the [zero-downtime deploy documentation](/docs/deployment/zero-downtime-deploys.md) for more information on how the new zero downtime check format works.
+- ARM support is now deprecated, and will be removed in the next minor release. ARM releases are not tested in CI and do not get testing locally. Users of ARM installations on platforms such as the Raspberry PI should consider migrating to ARM64. ARM64 will continue to be supported by Dokku, and there are no plans to remove support for ARM64.
+
+## Un-Deprecations
+
+- The bare `apps` and `config` cli aliases are no longer deprecated. This better follows Heroku's output and is more useful to users. The subcommands will be treated as the primary, documented versions, while the aliases are there for convenience.
+
+## Removals
+
+- The variable `RAW_TCP_PORTS` is no longer exposed for `nginx.conf.sigil` templating.
+- The environment variable `DOKKU_DOCKERFILE_PORTS` is no longer in use. Users wishing to change port mappings should instead use the `ports` plugin.
+- The `common#get_app_raw_tcp_ports()` function has been removed in the next release. Users should instead use the `ports-get` plugin trigger for fetching ports for an app.
+- The plugin trigger `network-compute-ports` has been removed. It's only use was in the `scheduler-docker-local` plugin, for exposing ports. It's functionality is now implemented via the `ports` plugin.
+- The plugin trigger `network-get-port` has been removed. It's only use was in the `scheduler-docker-local` plugin, for recording ports. It's functionality is now implemented via the `ports` plugin.

docs/appendices/0.5.0-migration-guide.md

@@ -3,23 +3,23 @@
 ## `nginx-vhosts` plugin
 
 - The nginx-vhosts template language is now [sigil](https://github.com/gliderlabs/sigil)
-  - No need to escape literal `$` characters (or other "bash-isms")
-  - Template variables are represented as {{ .VARIABLE_NAME }}
-  - A detailed list of template variables can be found [here](/docs/configuration/nginx.md#available-template-variables)
+    - No need to escape literal `$` characters (or other "bash-isms")
+    - Template variables are represented as {{ .VARIABLE_NAME }}
+    - A detailed list of template variables can be found [here](/docs/networking/proxies/nginx.md#available-template-variables)
 - A custom nginx-vhosts template must be named `nginx.conf.sigil`
-  - The default path for this custom template is the root of your repo (i.e. `/app` in the container or `WORKDIR` if defined in a dockerfile app)
-  - Dokku no longer looks for this file in `/home/dokku/node-js-app` on the Dokku server
-  - Check out an example template [here](/docs/configuration/nginx.md)
+    - The default path for this custom template is the root of your repo (i.e. `/app` in the container or `WORKDIR` if defined in a dockerfile app)
+    - Dokku no longer looks for this file in `/home/dokku/node-js-app` on the Dokku server
+    - Check out an example template [here](/docs/networking/proxies/nginx.md)
 - Support for server-wide SSL certs have been dropped in favor of using the `certs` plugin
-  - `dokku certs:add node-js-app < certs.tar`
+    - `dokku certs:add node-js-app < certs.tar`
 - All domains for an SSL-enabled app will be redirected to https by default
-  - This can be overridden with a custom template
+    - This can be overridden with a custom template
 - Replaced "magic" `NO_VHOST` variable with `domains:enable/disable`
 - Simplified zero downtime control
-  - `checks:enable/disable`
+    - `checks:enable/disable`
 
 ## Dockerfile apps with exposed ports
 
 - Dockerfiles with `EXPOSE` clauses will get [all **tcp** ports proxied by default](/docs/deployment/builders/dockerfiles.md#exposed-ports)
-  - Note that nginx will proxy the same port numbers to listen publicly
-  - UDP ports can be exposed by disabling the [nginx proxy](/docs/networking/proxy-management.md) with `dokku proxy:disable node-js-app`
+    - Note that nginx will proxy the same port numbers to listen publicly
+    - UDP ports can be exposed by disabling the [nginx proxy](/docs/networking/proxy-management.md) with `dokku proxy:disable node-js-app`

docs/appendices/0.6.0-migration-guide.md

@@ -3,30 +3,30 @@
 ## Zero-downtime deployment
 
 - You can now **actually** disable zero-downtime deployments per-app and per-process-type
-  - Some config variables have been moved around
-    - `DOKKU_CHECKS_ENABLED` has been migrated to `DOKKU_CHECKS_SKIPPED`
-    - `DOKKU_CHECKS_DISABLED` is now a thing
-    - The values for the above can be a comma-separated list of process-types or the literal string `_all_`
-  - See the [updated `checks`](/docs/deployment/zero-downtime-deploys.md) docs for more info
+    - Some config variables have been moved around
+        - `DOKKU_CHECKS_ENABLED` has been migrated to `DOKKU_CHECKS_SKIPPED`
+        - `DOKKU_CHECKS_DISABLED` is now a thing
+        - The values for the above can be a comma-separated list of process-types or the literal string `_all_`
+    - See the [updated `checks`](/docs/deployment/zero-downtime-deploys.md) docs for more info
 
 ## Proxy port mapping
 
 - You can now configure host -> container proxy port mappings
-  - The UI is handled by the [proxy](/docs/networking/proxy-management.md) interface plugin by setting the `DOKKU_PROXY_PORT_MAP` config variable in the format of `scheme:host-port:container-port`. The default `nginx-vhosts` proxy plugin supports both the `http` and `https` schemes.
+    - The UI is handled by the [proxy](/docs/networking/proxy-management.md) interface plugin by setting the `DOKKU_PROXY_PORT_MAP` config variable in the format of `scheme:host-port:container-port`. The default `nginx-vhosts` proxy plugin supports both the `http` and `https` schemes.
 - Default port mappings
-  - buildpack apps will be set to `http:80:5000` and will also include `https:443:5000` if SSL is enabled.
-  - dockerfile apps with explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on each exposed port that proxies to the same port of the deployed application container.
-    - You may override this behavior with the [`proxy:ports-*` commands](/docs/networking/proxy-management.md) or by directly setting `DOKKU_PROXY_PORT_MAP` with the `config:set` command
-    - dockerfile apps without explicitly exposed ports will behave the same as a buildpack app
-  - NOTE: These defaults **are not** automatically changed on subsequent pushes and must be manipulated with the aforementioned commands
+    - buildpack apps will be set to `http:80:5000` and will also include `https:443:5000` if SSL is enabled.
+    - dockerfile apps with explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on each exposed port that proxies to the same port of the deployed application container.
+        - You may override this behavior with the [`proxy:ports-*` commands](/docs/networking/proxy-management.md) or by directly setting `DOKKU_PROXY_PORT_MAP` with the `config:set` command
+        - dockerfile apps without explicitly exposed ports will behave the same as a buildpack app
+    - NOTE: These defaults **are not** automatically changed on subsequent pushes and must be manipulated with the aforementioned commands
 
 ## Calling the `dokku` binary
 
 - Plugins should *not* call the `dokku` binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions. As a result, the following Dokku commands are no longer publicly exposed:
-  - `dokku build`
-  - `dokku receive`
-  - `dokku release`
-  - `dokku tar:build`
-  - `dokku tar:build-locked`
-  - `dokku git:build`
-  - `dokku git:build-locked`
+    - `dokku build`
+    - `dokku receive`
+    - `dokku release`
+    - `dokku tar:build`
+    - `dokku tar:build-locked`
+    - `dokku git:build`
+    - `dokku git:build-locked`

docs/appendices/0.8.0-migration-guide.md

@@ -2,13 +2,13 @@
 
 ## Domain Management
 
-You can now set global and app domains via `domains:set` and `domains:set-global`. See the [domains documentation](/docs/configuration/domains/) for more details.
+You can now set global and app domains via `domains:set` and `domains:set-global`. See the [domains documentation](/docs/configuration/domains.md) for more details.
 
 ## Plugin Uninstallation
 
 A new `uninstall` plugin trigger was introduced. This functionality may be in use for newer plugins, so be aware that older Dokku versions may require manual cleanup.
 
-See the [uninstall trigger documentation](/docs/development/plugin-triggers/#uninstall) for implementation instructions.
+See the [uninstall trigger documentation](/docs/development/plugin-triggers.md#uninstall) for implementation instructions.
 
 ## Deployment Tasks
 

docs/assets/dokku-logo.svg

@@ -0,0 +1,31 @@
+<svg width="89" height="62" viewBox="0 0 89 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M78.4046 17.1912C84.738 21.1608 86.2188 20.7419 87.6794 19.9955C88.5202 19.5664 88.8496 18.5392 88.4243 17.6985C86.4622 13.818 78.212 0.118992 59.5364 0.118992C43.8588 0.118992 34.4377 13.3435 31.5684 18.0766C31.0067 19.0027 31.4447 20.2158 32.4755 20.5543C34.1357 21.0995 35.9508 21.216 39.8333 18.8625C52.5306 11.8038 78.4046 17.1912 78.4046 17.1912Z" fill="#F15B55"/>
+<mask id="mask0_55_415" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="31" y="0" width="58" height="21">
+<path d="M78.4212 17.0723C84.7546 21.0418 86.2354 20.6229 87.696 19.8766C88.5368 19.4474 88.8662 18.4202 88.4409 17.5795C86.4788 13.699 78.2286 3.8147e-06 59.553 3.8147e-06C43.8754 3.8147e-06 34.4543 13.2245 31.585 17.9576C31.0233 18.8837 31.4613 20.0969 32.4921 20.4353C34.1523 20.9805 35.9674 21.097 39.8499 18.7436C52.5472 11.6848 78.4212 17.0723 78.4212 17.0723Z" fill="#F15B55"/>
+</mask>
+<g mask="url(#mask0_55_415)">
+<path d="M43.7907 2.62413C49.4945 9.99967 33.5952 13.8544 45.8049 22.3539" stroke="#FF9580" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M56.7977 -1.62458C62.8837 6.0383 46.832 8.92189 53.8305 19.6981" stroke="#FF9580" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M72.3168 -0.867853C76.7291 7.02473 58.5477 8.73199 64.5571 18.3322" stroke="#FF9580" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M84.2603 7.02465C84.2603 15.1449 71.708 10.5128 72.3169 19.6982" stroke="#FF9580" stroke-width="1.5" stroke-miterlimit="10"/>
+</g>
+<g opacity="0.399994">
+<g opacity="0.399994">
+<path opacity="0.399994" d="M31.3365 18.747C31.2415 19.5146 31.6815 20.2937 32.4751 20.5544C34.1353 21.0993 35.9508 21.2158 39.8333 18.8623C52.5302 11.8039 78.4042 17.1914 78.4042 17.1914C84.7377 21.1606 86.2184 20.7416 87.6795 19.9957C88.3903 19.6328 88.7337 18.8419 88.5657 18.0976C78.1555 10.8635 54.5866 3.8145 31.3365 18.747Z" fill="black"/>
+</g>
+</g>
+<path d="M67.274 14.8087H56.4204C44.6233 14.8087 38.4193 18.2775 33.8378 24.2005L29.4542 29.8671L27.7038 32.1805C26.3653 33.9491 24.2728 34.9885 22.0517 34.9885C18.6867 34.9885 15.8194 32.6685 15.0623 29.48C15.0512 29.433 15.0385 29.359 15.025 29.2679C14.9103 28.4884 15.5203 27.7899 16.3099 27.7899H18.4798C22.2049 27.7899 25.2246 24.7776 25.2246 21.0614V20.5325C25.2246 19.8467 24.667 19.2904 23.979 19.2904H17.6005C15.0492 19.2904 13.2669 20.6106 12.6674 22.0612C12.0676 20.6106 10.2853 19.2904 7.73397 19.2904H1.35542C0.667492 19.2904 0.109863 19.8467 0.109863 20.5325V21.0614C0.109863 24.7776 3.12951 27.7899 6.85471 27.7899H9.05492C9.75186 27.7899 10.3443 28.2988 10.4476 28.9867L10.6905 30.604C13.3361 48.2223 28.5057 61.2576 46.3638 61.2576H47.2697H59.4081C71.7445 61.2576 82.2727 52.3616 84.302 40.2227L85.8397 31.0254C87.259 22.5369 81.2902 14.8087 67.274 14.8087Z" fill="#07CBCF"/>
+<path d="M81.4705 48.3116C79.3404 48.386 77.5986 49.0698 75.2239 51.4388C72.2001 54.4552 67.1794 57.8702 59.4197 57.8702H45.0417C39.2224 57.8702 35.1162 53.5434 35.1162 53.5434C35.1162 53.5434 31.7479 53.7154 24.4261 49.5603C12.4254 41.9906 11.9501 29.2979 11.7788 27.7043C11.6076 26.1106 10.7517 25.2568 9.04025 25.2568H6.70074C2.34293 25.2568 1.16088 23.1183 0.893741 19.3792C0.434853 19.5628 0.110352 20.0095 0.110352 20.5327V21.0612C0.110352 24.7773 3.13 27.7897 6.85479 27.7897H9.055C9.75235 27.7897 10.3448 28.2986 10.4481 28.9864L10.6906 30.6038C13.3362 48.2221 28.5062 61.2573 46.3643 61.2573H47.2698H59.4086C68.7888 61.2573 77.1226 56.113 81.4705 48.3116Z" fill="#05B7BF"/>
+<path d="M15.0249 29.2677C14.9102 28.4883 15.5203 27.7898 16.3098 27.7898H18.4797C22.2049 27.7898 25.2246 24.7774 25.2246 21.0617V20.5328C25.2246 20.0092 24.8997 19.5624 24.4404 19.3793V19.3797C24.1728 23.1184 22.9908 25.2569 18.633 25.2569H16.8376C14.4411 25.2569 14.7549 27.9512 15.0249 29.2677Z" fill="#05B7BF"/>
+<path d="M24.4257 49.5606C27.1262 52.1789 25.7188 53.2412 21.2307 53.2412H14.3327C13.2428 53.2412 12.697 54.5557 13.4677 55.3245L14.322 56.1767C16.9737 58.8224 20.5707 60.3085 24.3213 60.3085H24.9584C32.4133 60.3085 37.929 52.8239 37.929 52.8239L24.4257 49.5606Z" fill="#07CBCF"/>
+<path d="M35.1162 53.544C32.9984 55.5574 29.4485 58.1536 25.2235 58.1536H24.6339C21.1631 58.1536 17.8345 56.7783 15.3807 54.33L14.59 53.5415C14.497 53.4488 14.4257 53.3474 14.3728 53.2411H14.3327C13.2428 53.2411 12.697 54.5556 13.4677 55.3244L14.322 56.1766C16.9741 58.8223 20.5711 60.3085 24.3213 60.3085H24.9584C29.8025 60.3085 33.8281 57.1482 36.0533 54.9349L36.3528 54.6312L35.1162 53.544Z" fill="#05B7BF"/>
+<mask id="mask1_55_415" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="15" width="86" height="47">
+<path d="M67.1641 15.1884H56.3106C44.5134 15.1884 38.3094 18.6572 33.7279 24.5802L29.3443 30.2468L27.594 32.5602C26.2554 34.3288 24.163 35.3682 21.9419 35.3682C18.5768 35.3682 15.7096 33.0482 14.9524 29.8597C14.9413 29.8127 14.9286 29.7387 14.9151 29.6476C14.8004 28.8681 15.4105 28.1696 16.2 28.1696H18.3699C22.0951 28.1696 25.1147 25.1573 25.1147 21.4411V20.9122C25.1147 20.2264 24.5571 19.6701 23.8692 19.6701H17.4906C14.9393 19.6701 13.157 20.9903 12.5576 22.4409C11.9577 20.9903 10.1755 19.6701 7.62411 19.6701H1.24555C0.557629 19.6701 0 20.2264 0 20.9122V21.4411C0 25.1573 3.01965 28.1696 6.74484 28.1696H8.94506C9.64199 28.1696 10.2344 28.6785 10.3377 29.3664L10.5807 30.9837C13.2262 48.602 28.3958 61.6373 46.2539 61.6373H47.1598H59.2983C71.6346 61.6373 82.1628 52.7413 84.1922 40.6024L85.7299 31.4051C87.1491 22.9166 81.1803 15.1884 67.1641 15.1884Z" fill="#07CBCF"/>
+</mask>
+<g mask="url(#mask1_55_415)">
+<path d="M48.2573 43.0378C50.1929 48.5818 55.4426 52.9185 61.7015 52.9185C72.2568 52.9185 71.2993 45.7048 82.7326 45.7048H84.3526" stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M50.1195 43.0151H46.9814" stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M65.353 42.7305C65.353 41.096 64.0247 39.7709 62.3862 39.7709C60.7478 39.7709 59.4194 41.096 59.4194 42.7305" stroke="#00576C" stroke-width="1.46" stroke-miterlimit="10" stroke-linecap="round"/>
+</g>
+<path d="M77.4491 19.774C80.7847 21.9824 82.0434 23.4419 85.095 23.7701C82.9402 18.5919 77.0788 14.8087 67.2741 14.8087H56.4206C45.0819 14.8087 38.9111 18.0148 34.3804 23.5229C37.2443 23.5229 40.3812 21.1661 43.0628 19.698C46.182 17.9907 50.3669 16.3586 59.4197 16.3586C68.4725 16.3586 73.2651 17.004 77.4491 19.774Z" fill="#05B7BF"/>
+</svg>

docs/assets/extra.css

@@ -0,0 +1,5 @@
+:root > * {
+  --md-primary-fg-color:        #2A8FBD;
+  --md-primary-fg-color--light: #ECB7B7;
+  --md-primary-fg-color--dark:  #90030C;
+}

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

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