Release 0.28.2

# History

## 0.28.2

Install/update via the bootstrap script:

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

### Bug Fixes

- #5393: @josegonzalez Correct issue with replacing the version in the installation guide
- #5354: @josegonzalez Report the correct value for the letsencrypt server
- #5347: @josegonzalez Set correct version on builder-lambda plugin

### New Features

- #5392: @josegonzalez Add support for devcontainers on ARM64 instances

### Documentation

- #5365: @josegonzalez Use correct indentation for embedded list in remote commands documentation
- #5357: @josegonzalez Reference blog on main domain
- #5355: @josegonzalez Autogenerate documentation in CI
- #5351: @josegonzalez Fix formatting on list in deployment tasks
- #5328: @holtergram Call out git remote change when renaming an app
- #5344: @josegonzalez Generate docs via mkdocs
- #5342: @josegonzalez Ensure doc links work on github as well as on docs site
- #5336: @josegonzalez Add note about docker-compose requirement for using the caddy plugin
- #5337: @josegonzalez Add note about docker-compose requirement for using the traefik…
- #5332: @cdubz Remove errant semicolon from wget command
- #5329: @josegonzalez Use updated url for gliderlabs slack invite app
- #5315: @alexislefebvre Fix doc link for systems with less than 1GB memory

### Other

- #5382: @dependabot[bot] chore(deps): bump sinatra from 2.2.2 to 3.0.2 in /tests/apps/ruby
- #5386: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 224 to 225 in /tests/apps/php
- #5361: @dependabot[bot] chore(deps): bump jetty-servlet from 11.0.11 to 11.0.12 in /tests/apps/java
- #5346: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 223 to 224 in /tests/apps/php

.circleci/config.yml

@@ -1,3 +1,4 @@
+---
 version: 2.1
 
 jobs:

.codacy.yml

@@ -1,5 +1,10 @@
+---
+engines:
+  duplication:
+    exclude_paths:
+      - "*"
 exclude_paths:
-- vendor/**/*
-- tests/**/*
-- "**_test.go"
-- contrib/*
+  - vendor/**/*
+  - tests/**/*
+  - "**_test.go"
+  - contrib/*

.devcontainer/Dockerfile

@@ -0,0 +1,27 @@
+FROM dokku/dokku:latest
+
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y build-essential file nano && \
+  apt-get install --no-install-recommends -y help2man shellcheck uuid-runtime wget xmlstarlet && \
+  apt-get clean autoclean && \
+  apt-get autoremove --yes && \
+  rm -rf /var/lib/apt/lists/*
+
+ARG TARGETARCH
+RUN wget https://dl.google.com/go/go1.17.9.linux-${TARGETARCH}.tar.gz && \
+  tar -xvf go1.17.9.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
+
+ADD https://raw.githubusercontent.com/dokku/dokku/master/tests/dhparam.pem /mnt/dokku/etc/nginx/dhparam.pem
+
+COPY .devcontainer/bin/ /usr/local/bin/
+COPY ["tests.mk", "Makefile"]
+RUN make ci-dependencies
+
+COPY . .
+
+ENV DOKKU_HOSTNAME=dokku.me GOROOT=/usr/local/go PATH=/usr/local/go/bin:/root/go/bin:$PATH PLUGIN_MAKE_TARGET=build
+
+LABEL org.label-schema.schema-version=1.0 org.label-schema.vendor=dokku com.dokku.devcontainer=true

.devcontainer/bin/copy-plugin

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

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "containerEnv": {
+    "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data/home/dokku",
+    "GO_ROOT_MOUNT": "${localWorkspaceFolder}:/go/src/github.com/dokku/dokku"
+  },
+  "extensions": [
+    "golang.go",
+    "mads-hartmann.bash-ide-vscode",
+    "ms-vscode.makefile-tools"
+  ],
+  "initializeCommand": ["mkdir", "-p", "tmp/data"],
+  "mounts": [
+    "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
+    "source=${localWorkspaceFolder}/tmp/data/,target=/mnt/dokku/,type=bind"
+  ],
+  "overrideCommand": false,
+  "postCreateCommand": "make setup-deploy-tests",
+  "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,10 +6,10 @@ contrib
 build
 docs
 tests
-!build/dokku.deb
+!build/package/*
+!docs/_build/entrypoint
+!docs/_build/requirements.txt
 !tests/dhparam.pem
-!contrib/dokku-installer.py
-!contrib/dokku-update
 !contrib/bash-completion
 !contrib/docker
 vendor

.editorconfig

@@ -15,7 +15,7 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[*.go]
+[*.{go,mod}]
 insert_final_newline = true
 indent_style = tab
 indent_size = 4

.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/commands/bump-azure

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+main() {
+  declare VERSION="$1" BOT_GITHUB_USERNAME="$2" BOT_GITHUB_API_TOKEN="$3"
+  local GH_VERSION=1.6.1
+  local DATE_UPDATED="$(date +"%Y-%m-%d")"
+  local GH_FOLDER="gh_${GH_VERSION}_linux_amd64"
+
+  echo "=====> Downloading gh"
+  wget -O gh.tar.gz "https://github.com/cli/cli/releases/download/v${GH_VERSION}/${GH_FOLDER}.tar.gz"
+  mkdir -p tmp
+  tar xzf gh.tar.gz -C tmp
+  if [[ ! -f tmp/$GH_FOLDER/bin/gh ]]; then
+    echo "Failed to extract gh"
+    return 1
+  fi
+
+  cd tmp
+
+  $GH_FOLDER/bin/gh auth login --with-token <<<"$BOT_GITHUB_API_TOKEN"
+
+  echo "=====> Cloning quickstart templates"
+  rm -rf azure-quickstart-templates >/dev/null
+  git clone https://github.com/Azure/azure-quickstart-templates.git azure-quickstart-templates
+
+  pushd azure-quickstart-templates >/dev/null
+
+  echo "=====> Updating values"
+  contents="$(jq '.githubUsername = "dokku"' application-workloads/dokku/dokku-vm/metadata.json)"
+  echo "${contents}" >application-workloads/dokku/dokku-vm/metadata.json
+  contents="$(jq --arg DATE_UPDATED "$DATE_UPDATED" '.dateUpdated = $DATE_UPDATED' application-workloads/dokku/dokku-vm/metadata.json)"
+  echo "${contents}" >application-workloads/dokku/dokku-vm/metadata.json
+
+  contents="$(jq --arg VERSION "$VERSION" '.parameters.dokkuVersion.defaultValue = $VERSION' application-workloads/dokku/dokku-vm/azuredeploy.json)"
+  echo "${contents}" >application-workloads/dokku/dokku-vm/azuredeploy.json
+
+  echo "=====> Updating remote repository"
+  git add application-workloads/dokku/dokku-vm
+  git checkout -b dokku-$VERSION
+  git commit -m "Update dokku-vm dokku version to $VERSION"
+  git remote set-url origin "https://$BOT_GITHUB_USERNAME:$BOT_GITHUB_API_TOKEN@github.com/dokku/azure-quickstart-templates.git"
+  git push -f origin dokku-$VERSION
+
+  echo "=====> Creating upstream pull request"
+  ../$GH_FOLDER/bin/gh pr create --head dokku:dokku-$VERSION --repo Azure/azure-quickstart-templates --title "Update dokku-vm dokku version to $VERSION" --body ''
+
+  popd &>/dev/null
+}
+
+main "$@"

.github/commands/ci-run

@@ -7,7 +7,7 @@ main() {
   mkdir -p test-results/bats
   pushd tests/unit >/dev/null
   bats --report-formatter junit --output ../../test-results/bats "$FILE_NAME.bats"
-  popd >/dev/null
+  popd &>/dev/null
 
   ls -lah test-results/bats
 }

.github/commands/ci-setup

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 set -eo pipefail
+set -x
 
 echo "=====> set hostname"
 hostname
-internal_ip="$(ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}')"
+internal_ip="$(ifconfig eth0 | grep 'inet ' | awk '{print $2}')"
 sudo hostname "dokku.me"
 echo "dokku.me" | sudo tee /etc/hostname
 hostname

.github/dependabot.yml

@@ -0,0 +1,112 @@
+---
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: "/tests/apps/ruby"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: bundler
+    directory: "/tests/apps/multi"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/checks-root"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/config"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/dockerfile-dokku-scale"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/dockerfile-noexpose"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/dockerfile-procfile-bad"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/dockerfile-procfile"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/dockerfile"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/gitsubmodules"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: gomod
+    directory: "/tests/apps/gogrpc"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: google.golang.org/grpc
+        versions:
+          - "> 1.29.1"
+  - package-ecosystem: pip
+    directory: "/tests/apps/multi"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: maven
+    directory: "/tests/apps/java"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/nodejs-express"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/nodejs-worker"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/nodejs-express-noappjson"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/nodejs-express-noprocfile"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: composer
+    directory: "/tests/apps/php"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: pip
+    directory: "/tests/apps/python-flask"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/tests/apps/.websocket.disabled"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10

.github/linters/.markdown-lint.yml

@@ -0,0 +1,10 @@
+---
+default: true
+
+# Line length
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md013
+MD013: false
+
+# Inline HTML
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md033
+MD033: false

.github/linters/.yamllint.yml

@@ -0,0 +1,5 @@
+---
+extends: default
+
+rules:
+  line-length: disable

.github/workflows/bump-formula.yml

@@ -1,23 +0,0 @@
-name: bump-formula
-on:
-  push:
-   tags:
-     - '*'
-jobs:
-  bump-formula:
-    runs-on: macos-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Get version
-      id: get_version
-      run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
-    - name: Bump Brew
-      env:
-        HOMEBREW_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
-        HOMEBREW_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
-        brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git"
-        brew bump-formula-pr -f --no-browse --no-audit --no-fork --url "https://github.com/dokku/dokku/archive/${{ steps.get_version.outputs.version }}.tar.gz" dokku/repo/dokku

.github/workflows/ci.yml

@@ -1,5 +1,7 @@
+---
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   pull_request:
     branches:
@@ -11,94 +13,106 @@ on:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     strategy:
       fail-fast: true
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: build package
-      run: ./tests/ci/setup.sh build
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v2
 
-    - name: set matrix for build
-      id: set-matrix
-      run: |
-        json=$(python .github/commands/matrix)
-        echo $json
-        echo "::set-output name=matrix::$(echo "$json")"
+      - name: set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
 
-    - name: upload packages
-      uses: actions/upload-artifact@v2
-      with:
-        name: build
-        path: build
+      - name: build package
+        run: ./tests/ci/setup.sh build
+
+      - name: set matrix for build
+        id: set-matrix
+        run: |
+          json=$(python .github/commands/matrix)
+          echo $json
+          echo "::set-output name=matrix::$(echo "$json")"
+
+      - name: upload packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: build
+          path: build
 
   unit-tests:
     name: unit.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.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
-      with:
-        name: build
+      - name: download packages
+        uses: actions/download-artifact@v1
+        with:
+          name: build
 
-    - name: ci-setup
-      run: ./.github/commands/ci-setup
+      - name: ci-setup
+        run: ./.github/commands/ci-setup
 
-    # - name: start ssh session
-    #   uses: luchihoratiu/debug-via-ssh@main
-    #   with:
-    #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-    #     SSH_PASS: ${{ secrets.SSH_PASS }}
+      # - name: start ssh session
+      #   uses: luchihoratiu/debug-via-ssh@main
+      #   with:
+      #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
+      #     SSH_PASS: ${{ secrets.SSH_PASS }}
 
-    - name: run ci
-      timeout-minutes: 30
-      run: sudo -E ./.github/commands/ci-run ${{ matrix.index }}
+      - name: run ci
+        timeout-minutes: 30
+        run: sudo -E ./.github/commands/ci-run ${{ matrix.index }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+          SYNC_GITHUB_PASSWORD: ${{ secrets.SYNC_GITHUB_PASSWORD }}
+          SYNC_GITHUB_USERNAME: ${{ secrets.SYNC_GITHUB_USERNAME }}
 
-    - uses: actions/upload-artifact@v2
-      with:
-        name: test-results-${{ matrix.index }}
-        path: test-results
+      - uses: actions/upload-artifact@v3
+        with:
+          name: test-results-${{ matrix.index }}
+          path: test-results
 
   docker-deploy-tests:
     name: docker
     needs: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: download packages
-      uses: actions/download-artifact@v1
-      with:
-        name: build
+      - name: download packages
+        uses: actions/download-artifact@v1
+        with:
+          name: build
 
-    - name: ci-setup
-      run: ./.github/commands/ci-setup
+      - name: ci-setup
+        run: ./.github/commands/ci-setup
 
-    - name: test docker deploys
-      shell: bash
-      timeout-minutes: 20
-      run: |
-        ./tests/ci/setup.sh docker
-        DOKKU_SSH_PORT=3022 sudo -E make -e test-ci-docker
+      - name: test docker deploys
+        shell: bash
+        timeout-minutes: 20
+        run: |
+          ./tests/ci/setup.sh docker
+          DOKKU_SSH_PORT=3022 sudo -E make -e test-ci-docker
 
   go-tests:
     name: go.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
@@ -107,51 +121,51 @@ jobs:
       GITHUB_NODE_INDEX: ${{ matrix.index }}
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: download packages
-      uses: actions/download-artifact@v1
-      with:
-        name: build
+      - name: download packages
+        uses: actions/download-artifact@v1
+        with:
+          name: build
 
-    - name: ci-setup
-      run: ./.github/commands/ci-setup
+      - name: ci-setup
+        run: ./.github/commands/ci-setup
 
-    - name: run go tests
-      run: |
-        export CIRCLE_SHA1=$GITHUB_SHA
-        echo "CODACY_TOKEN=$CODACY_TOKEN"
-        if [ "$CODACY_TOKEN" != "" ]; then
-          echo "Detected value for CODACY_TOKEN"
-        fi
-        case $GITHUB_NODE_INDEX in
-          0) sudo -E make -e lint-ci go-tests ci-go-coverage ;;
-          1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
-          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
-      with:
-        name: coverage.${{ matrix.index }}
-        path: test-results/coverage
+      - name: run go tests
+        run: |
+          export CIRCLE_SHA1=$GITHUB_SHA
+          echo "CODACY_TOKEN=$CODACY_TOKEN"
+          if [ "$CODACY_TOKEN" != "" ]; then
+            echo "Detected value for CODACY_TOKEN"
+          fi
+          case $GITHUB_NODE_INDEX in
+            0) sudo -E make -e lint-ci go-tests ci-go-coverage ;;
+            1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
+            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@v3
+        with:
+          name: coverage.${{ matrix.index }}
+          path: test-results/coverage
 
   publish-test-results:
     name: publish-test-results
     needs: unit-tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     # 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
-      with:
-        path: test-results
+      - name: download test-results
+        uses: actions/download-artifact@v2
+        with:
+          path: test-results
 
-    - name: Publish Unit Test Results
-      uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1.6
-      with:
-        check_name: Unit Test Results
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        files: test-results/**/*.xml
-        comment_on_pr: false
+      - name: Publish Unit Test Results
+        uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1
+        with:
+          check_name: Unit Test Results
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          files: test-results/**/*.xml
+          comment_on_pr: false

.github/workflows/codeql-analysis.yml

@@ -1,3 +1,4 @@
+---
 # For most projects, this workflow file will not need changing; you simply need
 # to commit it to your repository.
 #
@@ -12,12 +13,13 @@
 
 name: "CodeQL"
 
+# yamllint disable-line rule:truthy
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
   schedule:
     - cron: '18 22 * * 2'
 
@@ -29,40 +31,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go' ]
+        language: ['go']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        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.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # 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
+      # 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@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      # - run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        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@v2
+        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

@@ -0,0 +1,74 @@
+---
+name: 'lint'
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  hadolint:
+    name: hadolint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+      - name: Run hadolint
+        uses: hadolint/hadolint-action@f988afea3da57ee48710a9795b6bb677cc901183
+        # v1.6.0 => d7b38582334d9ac11c12021c16f21d63015fa250
+
+  markdown-lint:
+    name: markdown-lint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+      - name: Run markdown-lint
+        uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb
+        # v1.5.0 => 04d43ee9191307b50935a753da3b775ab695eceb
+        with:
+          config: '.github/linters/.markdown-lint.yml'
+          args: './README.md'
+
+  shellcheck:
+    name: shellcheck
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+      - name: Run shellcheck
+        uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
+        # 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@v3
+      - name: Run shfmt
+        uses: luizm/action-sh-checker@edd0e45ecff35b05f162052b50df50976c1b74fc
+        # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
+        env:
+          SHFMT_OPTS: -l -bn -ci -i 2 -d
+        with:
+          sh_checker_shellcheck_disable: true
+
+  yamllint:
+    name: yamllint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+      - name: Run yamllint
+        uses: ibiqlik/action-yamllint@81e214fd484713882ce4237cb7cd264d550856cf
+        # v3.0.4 => ed2b6e911569708ed121c14b87d513860a7e36a7
+        with:
+          config_file: '.github/linters/.yamllint.yml'

.github/workflows/release.yml

@@ -0,0 +1,105 @@
+---
+name: 'release'
+
+# yamllint disable-line rule:truthy
+on:
+  workflow_dispatch:
+    inputs:
+      release_type:
+        description: 'Release type [build, betafish, patch, minor, major]'
+        required: true
+        default: 'build'
+
+jobs:
+  release:
+    name: release
+    runs-on: ubuntu-20.04
+    env:
+      PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
+      - 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
+
+      - name: configure git
+        run: |
+          git config --global user.name 'Dokku Bot'
+          git config --global user.email no-reply@dokku.com
+
+      - name: build package
+        run: contrib/release-dokku ${{ github.event.inputs.release_type }}
+
+      - name: output version
+        id: version
+        run: echo "::set-output name=version::$(cat build/next-version)"
+
+      - name: upload packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: build
+          path: build
+
+  bump-azure:
+    name: bump-azure
+    runs-on: ubuntu-20.04
+    needs: release
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Bump Azure Template
+        env:
+          BOT_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          BOT_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+        run: |
+          VERSION=${{ needs.release.outputs.version }}
+          git config --global user.name 'Dokku Bot'
+          git config --global user.email no-reply@dokku.com
+          .github/commands/bump-azure "${VERSION:1}" "$BOT_GITHUB_USERNAME" "$BOT_GITHUB_API_TOKEN"
+
+  bump-formula:
+    name: bump-formula
+    runs-on: macos-latest
+    needs: release
+    steps:
+      - name: Bump Homebrew Formula
+        env:
+          HOMEBREW_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          HOMEBREW_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 -sSL https://github.com/dokku/netrc/releases/download/v0.4.1/netrc_0.4.1_darwin_x86_64.tgz | tar xvf -
+          mv netrc /usr/local/bin/netrc
+          netrc set github.com "$HOMEBREW_GITHUB_USERNAME" "$HOMEBREW_GITHUB_API_TOKEN"
+          brew tap dokku/repo
+          brew bump-formula-pr -f --no-browse --no-audit --no-fork --debug --verbose --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku

.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .ruby-version
 .idea/
+.vscode/
 .vagrant
 build/
 data/
@@ -10,4 +11,3 @@ test-results/
 stack.tgz
 tmp
 coverage.out
-contrib/dokku-update-version

.shellcheckrc

@@ -0,0 +1,9 @@
+# SC1091 - Not following: FILE: does not exist (No such file or directory) - https://github.com/koalaman/shellcheck/wiki/SC1091
+#        - used for sourcing function files throughout the codebase
+# SC2034 - VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034
+#        - used for declaring desc and deprecated function variables
+# SC2064 - Use single quotes, otherwise this expands now rather than when signalled. - https://github.com/koalaman/shellcheck/wiki/SC2064
+#        - used for traps
+# SC2155 - Declare and assign separately to avoid masking return values - https://github.com/koalaman/shellcheck/wiki/SC2155
+#        - used throughout the codebase
+disable=SC1091,SC2034,SC2064,SC2155

CONTRIBUTING.md

@@ -3,30 +3,28 @@
 The Dokku project would love to welcome your contributions. There are
 several ways to help out:
 
-* Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you
-  have found a bug
-* Write [test cases](http://dokku.viewdocs.io/dokku/development/testing/) for open bug issues
-* Write patches for open bug/feature issues, preferably with test cases
-  included
-* Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
-* Come up with new ways, non-commercial to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
-* Blog about different ways you are using dokku
-* Sponsor the Dokku project financially on [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku)
+- Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you have found a bug
+- Write [test cases](https://dokku.com/docs/development/testing/) for open bug issues
+- Write patches for open bug/feature issues, preferably with test cases included
+- Contribute to the [documentation](https://dokku.com/docs/)
+- Come up with new ways, non-commercial to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
+- Blog about different ways you are using dokku
+- Sponsor the Dokku project financially on [Github](https://github.com/sponsors/dokku), [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku)
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
 
 ## Topics
 
-* [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)
-* [Additional Resources](#additional-resources)
+- [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)
+- [Additional Resources](#additional-resources)
 
 ## Reporting security issues
 
@@ -45,7 +43,7 @@ encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!
 
 Sometimes  Dokku  is missing a feature you need. In some cases, those features can
-be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
+be found in pre-existing [plugins](https://dokku.com/docs/plugins/),
 and we encourage our users to create and contribute such packages. From time to
 time, we will also pull plugins into the Dokku core when the task they solve is
 a common one for our users.
@@ -65,37 +63,36 @@ you.
 Before you contribute to the Dokku project, there are a few things that you'll
 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.
-* Fork the repository on GitHub.
+- 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.
+- 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
+- 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`.
+  - 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
+- 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
+  - 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,
+  - 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.
-* Core test cases should continue to pass. You can run tests locally or enable
+- Check for unnecessary whitespace with `git diff --check` before committing.
+- Use descriptive commit messages and reference the #issue number.
+- Core test cases should continue to pass. You can run tests locally or enable
   [circle-ci](https://circleci.com/gh/dokku/dokku) for your fork, so all
   tests and codesniffs will be executed.
-* 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
+- 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
@@ -104,8 +101,8 @@ All changes should be be based on the latest master commit.
 
 ### Submitting Changes
 
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository on github, with the correct target
+- Push your changes to a topic branch in your fork of the repository.
+- Submit a pull request to the repository on github, with the correct target
   branch.
 
 ### When will my change be merged?
@@ -129,13 +126,13 @@ requests:
 
 ### Running tests locally
 
-Please read the [testing docs](http://dokku.viewdocs.io/dokku/development/testing/),
+Please read the [testing docs](https://dokku.com/docs/development/testing/),
 which contains test setup information as well as tips for running tests.
 
-# Additional Resources
+## Additional Resources
 
-* [Dokku coding standards](https://github.com/progrium/bashstyle)
-* [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/)
-* [#dokku IRC channel on freenode.org](https://webchat.freenode.net/?channels=dokku)
+- [Dokku coding standards](https://github.com/progrium/bashstyle)
+- [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://slack.dokku.com/)

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.2.0
 
 CMD ["/sbin/my_init"]
 
@@ -11,46 +11,48 @@ ARG DOKKU_VHOST_ENABLE=false
 ARG DOKKU_WEB_CONFIG=false
 
 RUN addgroup --gid $DOKKU_GID dokku \
-      && adduser --uid $DOKKU_UID --gid $DOKKU_GID --disabled-password --gecos "" "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 \
-      && 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 \
-      && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG" | 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 \
-      && 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 clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+  && 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/ 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 \
+  && 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
 
 COPY ./docker .
 
 RUN \
-    rsync -a /tmp/ / \
-      && rm -rf /tmp/* \
-      && rm /etc/runit/runsvdir/default/sshd/down \
-      && chown -R dokku:dokku /home/dokku/ \
-      && mkdir -p /skel/etc /skel/home /skel/var/lib/dokku /var/log/services \
-      && mv /etc/ssh /skel/etc/ssh \
-      && mv /home/dokku /skel/home/dokku \
-      && mv /var/lib/dokku/config /skel/var/lib/dokku/config \
-      && mv /var/lib/dokku/data /skel/var/lib/dokku/data \
-      && ln -sf /mnt/dokku/etc/ssh /etc/ssh \
-      && 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 \
-      && 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 \
-      && sed -i '/imklog/d' /etc/rsyslog.conf \
-      && rm -f /var/log/btmp /var/log/wtmp /var/log/*log /var/log/apt/* /var/log/dokku/*.log /var/log/nginx/* /var/log/openresty/*
+  rsync -a /tmp/ / \
+  && rm -rf /tmp/* \
+  && rm /etc/runit/runsvdir/default/sshd/down \
+  && chown -R dokku:dokku /home/dokku/ \
+  && mkdir -p /skel/etc /skel/home /skel/var/lib/dokku /var/log/services \
+  && mv /etc/ssh /skel/etc/ssh \
+  && mv /home/dokku /skel/home/dokku \
+  && mv /var/lib/dokku/config /skel/var/lib/dokku/config \
+  && mv /var/lib/dokku/data /skel/var/lib/dokku/data \
+  && ln -sf /mnt/dokku/etc/ssh /etc/ssh \
+  && 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 \
+  && 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 \
+  && sed -i '/imklog/d' /etc/rsyslog.conf \
+  && rm -f /var/log/btmp /var/log/wtmp /var/log/*log /var/log/apt/* /var/log/dokku/*.log /var/log/nginx/* /var/log/openresty/*

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](http://dokku.viewdocs.io/dokku/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
 

Makefile

@@ -1,18 +1,24 @@
 DOKKU_VERSION ?= master
 
-DOCKER_IMAGE_LABELER_VERSION ?= 0.2.2
-HEROKUISH_VERSION ?= 0.5.25
-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
-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.5.0
+HEROKUISH_VERSION ?= 0.5.37
+LAMBDA_BUILDER_VERSION ?= 0.4.0
+NETRC_VERSION ?= 0.6.0
+PLUGN_VERSION ?= 0.12.0
+PROCFILE_VERSION ?= 0.15.0
+SIGIL_VERSION ?= 0.9.0
+SSHCOMMAND_VERSION ?= 0.16.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_${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
+PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest-20
 DOKKU_LIB_ROOT ?= /var/lib/dokku
 PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins
 CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins
@@ -34,12 +40,12 @@ endif
 
 include common.mk
 
-.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies docker-image-labeler sshcommand procfile-util plugn docker aufs stack count dokku-installer 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:
@@ -108,7 +114,11 @@ endif
 
 addman: help2man man-db
 	mkdir -p /usr/local/share/man/man1
+ifneq ("$(wildcard /usr/local/share/man/man1/dokku.1-generated)","")
+	cp /usr/local/share/man/man1/dokku.1-generated /usr/local/share/man/man1/dokku.1
+else
 	help2man -Nh help -v version -n "configure and get information from your dokku installation" -o /usr/local/share/man/man1/dokku.1 dokku
+endif
 	mandb
 
 version:
@@ -125,12 +135,15 @@ plugin-dependencies: plugn procfile-util
 plugins: plugn procfile-util docker
 	sudo -E dokku plugin:install --core
 
-dependencies: apt-update docker-image-labeler sshcommand plugn procfile-util docker help2man man-db sigil dos2unix jq
+dependencies: apt-update docker-image-labeler lambda-builder netrc sshcommand plugn procfile-util docker help2man man-db sigil dos2unix jq parallel
 	$(MAKE) -e stack
 
 apt-update:
 	apt-get update -qq
 
+parallel:
+	apt-get -qq -y --no-install-recommends install parallel
+
 jq:
 	apt-get -qq -y --no-install-recommends install jq
 
@@ -146,24 +159,38 @@ 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
+
+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}
 	tar xzf /tmp/sshcommand_latest.tgz -C /usr/local/bin
 	sshcommand create dokku /usr/local/bin/dokku
 
-procfile-util:
-	wget -qO /tmp/procfile-util_latest.tgz ${PROCFILE_UTIL_URL}
-	tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin
-
-plugn:
-	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
-	tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
-
-sigil:
-	wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
-	tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
-
 docker:
 	apt-get -qq -y --no-install-recommends install curl
 	grep -i -E "^docker" /etc/group || groupadd docker
@@ -200,12 +227,6 @@ count:
 	@echo "Test lines:"
 	@find tests -type f -not -name .DS_Store | xargs cat | sed 's/^$$//g' | wc -l
 
-dokku-installer:
-	test -f /var/lib/dokku/.dokku-installer-created || python contrib/dokku-installer.py onboot
-	test -f /var/lib/dokku/.dokku-installer-created || service dokku-installer start
-	test -f /var/lib/dokku/.dokku-installer-created || service nginx reload
-	test -f /var/lib/dokku/.dokku-installer-created || touch /var/lib/dokku/.dokku-installer-created
-
 vagrant-acl-add:
 	vagrant ssh -- sudo sshcommand acl-add dokku $(USER)
 

PULL_REQUEST_TEMPLATE.md

@@ -1 +0,0 @@
-**Note:** If this PR is just doc changes, please put [ci skip] in the body that way tests do not run.

README.md

@@ -1,10 +1,10 @@
 # Dokku
+
 [![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/)
-[![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku)
-[![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://glider-slackin.herokuapp.com/)
-[![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg?style=flat-square "Viewdocs")](http://dokku.viewdocs.io/dokku/)
+[![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)
 [![Patreon](https://img.shields.io/badge/patreon-donate-green.svg?style=flat-square)](https://www.patreon.com/dokku/)
@@ -13,82 +13,69 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 
 ## Sponsors
 
-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>
+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)]
 
+[![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 16.04/18.04/20.04 x64 - Any currently supported release
-- Debian 9+ x64
-- CentOS 7 x64 *(experimental)*
+- Ubuntu 18.04 / 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.
@@ -99,29 +86,29 @@ 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.23.3/bootstrap.sh
-sudo DOKKU_TAG=v0.23.3 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.28.2/bootstrap.sh
+sudo DOKKU_TAG=v0.28.2 bash bootstrap.sh
 ```
 
-You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
+You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.
 
-If you wish for a more unattended installation method, see [these](http://dokku.viewdocs.io/dokku/getting-started/install/debian/#unattended-installation) docs.
+If you wish for a more unattended installation method, see [these](https://dokku.com/docs/getting-started/install/debian/#unattended-installation) docs.
 
 ### Upgrade
 
-[View the docs](http://dokku.viewdocs.io/dokku/getting-started/upgrading/) for upgrading from an older version of Dokku.
+[View the docs](https://dokku.com/docs/getting-started/upgrading/) for upgrading from an older version of Dokku.
 
 ## Documentation
 
-Full documentation - including advanced installation docs - are available online at [http://dokku.viewdocs.io/dokku/](http://dokku.viewdocs.io/dokku/).
+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](http://dokku.viewdocs.io/dokku/getting-started/troubleshooting/) in the documentation, or join us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku).
+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](http://dokku.viewdocs.io/dokku/getting-started/troubleshooting/) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), 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

@@ -6,7 +6,6 @@ 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
 
@@ -56,7 +54,6 @@ Vagrant::configure("2") do |config|
     end
 
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update -qq >/dev/null && apt-get -qq -y --no-install-recommends install git build-essential >/dev/null && cd /root/dokku && #{make_cmd}"
-    vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
     vm.vm.provision :shell do |s|
       s.inline = <<-EOT
         echo '"\e[5~": history-search-backward' > /root/.inputrc
@@ -65,42 +62,33 @@ Vagrant::configure("2") do |config|
         echo 'set completion-ignore-case on' >> /root/.inputrc
       EOT
     end
+
+    if Pathname.new(PUBLIC_KEY_PATH).exist?
+      vm.vm.provision :shell, :inline => "echo 'Importing ssh key into dokku' && cat /root/.ssh/authorized_keys | dokku ssh-keys:add admin"
+    end
   end
 
   # 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"
     vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && dos2unix bootstrap.sh && bash bootstrap.sh"
-    vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
   end
 
   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|
@@ -109,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
@@ -117,6 +104,6 @@ Vagrant::configure("2") do |config|
 
   if Pathname.new(PUBLIC_KEY_PATH).exist?
     config.vm.provision :file, source: PUBLIC_KEY_PATH, destination: '/tmp/id_rsa.pub'
-    config.vm.provision :shell, :inline => "rm -f /root/.ssh/authorized_keys && mkdir -p /root/.ssh && sudo cp /tmp/id_rsa.pub /root/.ssh/authorized_keys"
+    config.vm.provision :shell, :inline => "echo 'Copying ssh key into vm' && rm -f /root/.ssh/authorized_keys && mkdir -p /root/.ssh && sudo cp /tmp/id_rsa.pub /root/.ssh/authorized_keys"
   end
 end

bootstrap.sh

@@ -3,16 +3,16 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 # A script to bootstrap dokku.
-# It expects to be run on Ubuntu 16.04/18.04/20.04, or CentOS 7 via 'sudo'
+# It expects to be run on Ubuntu 18.04/20.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.
+# It checks out the dokku source code from GitHub into ~/dokku and then runs 'make install' from dokku source.
 
 # We wrap this whole script in functions, so that we won't execute
 # until the entire script is downloaded.
 # 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], CentOS [7], Ubuntu [16.04, 18.04, 20.04]"
+SUPPORTED_VERSIONS="Debian [10, 11], Ubuntu [18.04, 20.04, 22.04]"
 
 log-fail() {
   declare desc="log fail formatter"
@@ -35,7 +35,7 @@ ensure-environment() {
   FREE_MEMORY=$(grep MemTotal /proc/meminfo | awk '{print $2}')
   if [[ "$FREE_MEMORY" -lt 1003600 ]]; then
     echo "For dokku to build containers, it is strongly suggested that you have 1024 megabytes or more of free memory"
-    echo "If necessary, please consult this document to setup swap: http://dokku.viewdocs.io/dokku/getting-started/advanced-installation/#vms-with-less-than-1-gb-of-memory"
+    echo "If necessary, please consult this document to setup swap: https://dokku.com/docs/getting-started/advanced-installation/#vms-with-less-than-1-gb-of-memory"
   fi
 }
 
@@ -44,24 +44,42 @@ install-requirements() {
 
   case "$DOKKU_DISTRO" in
     debian)
+      if ! dpkg -l | grep -q gpg-agent; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y --no-install-recommends install gpg-agent
+      fi
       if ! dpkg -l | grep -q software-properties-common; then
         apt-get update -qq >/dev/null
         apt-get -qq -y --no-install-recommends install software-properties-common
       fi
       ;;
     ubuntu)
+      if ! dpkg -l | grep -q gpg-agent; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y --no-install-recommends install gpg-agent
+      fi
       if ! dpkg -l | grep -q software-properties-common; then
         apt-get update -qq >/dev/null
         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
 }
 
 install-dokku() {
+  if ! command -v dokku &>/dev/null; then
+    echo "--> Note: Installing dokku for the first time will result in removal of"
+    echo "    files in the nginx 'sites-enabled' directory. Please manually"
+    echo "    restore any files that may be removed after the installation and"
+    echo "    web setup is complete."
+    echo ""
+    echo "    Installation will continue in 10 seconds."
+    sleep 10
+  fi
+
   if [[ -n $DOKKU_BRANCH ]]; then
     install-dokku-from-source "origin/$DOKKU_BRANCH"
   elif [[ -n $DOKKU_TAG ]]; then
@@ -101,7 +119,7 @@ install-dokku-from-source() {
   local DOKKU_CHECKOUT="$1"
 
   if ! command -v apt-get &>/dev/null; then
-    log-fail "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
+    log-fail "This installation script requires apt-get. For manual installation instructions, consult https://dokku.com/docs/getting-started/advanced-installation/"
   fi
 
   apt-get -qq -y --no-install-recommends install sudo git make software-properties-common
@@ -121,11 +139,8 @@ install-dokku-from-package() {
     debian | ubuntu)
       install-dokku-from-deb-package "$@"
       ;;
-    centos | rhel)
-      install-dokku-from-rpm-package "$@"
-      ;;
     *)
-      log-fail "Unsupported Linux distribution. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
+      log-fail "Unsupported Linux distribution. For manual installation instructions, consult https://dokku.com/docs/getting-started/advanced-installation/"
       ;;
   esac
 }
@@ -145,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" "16.04" "18.04" "20.04" "9" "10"; then
+  if ! in-array "$DOKKU_DISTRO_VERSION" "18.04" "20.04" "22.04" "10" "11"; then
     log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
   fi
 
@@ -162,6 +177,7 @@ install-dokku-from-deb-package() {
     if uname -r | grep -q linode; then
       echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
       echo "    You can safely ignore this warning."
+      echo ""
       echo "    Installation will continue in 10 seconds."
       sleep 10
     fi
@@ -170,30 +186,34 @@ install-dokku-from-deb-package() {
   fi
 
   OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
-  if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
+  if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu" "raspbian"; then
     DOKKU_DISTRO="ubuntu"
     OS_ID="bionic"
   fi
 
   if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
-    OS_IDS=("xenial" "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")
+    OS_IDS=("stretch" "buster" "bullseye")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
-      OS_ID="buster"
+      OS_ID="bullseye"
+    fi
+  elif [[ "$DOKKU_DISTRO" == "raspbian" ]]; then
+    OS_IDS=("buster" "bullseye")
+    if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
+      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
 
   [[ -n $DOKKU_VHOST_ENABLE ]] && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | sudo debconf-set-selections
-  [[ -n $DOKKU_WEB_CONFIG ]] && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG" | sudo debconf-set-selections
   [[ -n $DOKKU_HOSTNAME ]] && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | sudo debconf-set-selections
   [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
   [[ -n $DOKKU_KEY_FILE ]] && echo "dokku dokku/key_file string $DOKKU_KEY_FILE" | sudo debconf-set-selections
@@ -208,35 +228,6 @@ install-dokku-from-deb-package() {
   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
@@ -250,6 +241,10 @@ main() {
   ensure-environment
   install-requirements
   install-dokku
+
+  if [[ -f /etc/update-motd.d/99-dokku ]]; then
+    /etc/update-motd.d/99-dokku || true
+  fi
 }
 
 main "$@"

common.mk

@@ -1,9 +1,11 @@
 GO_ARGS ?=
 GO_PLUGIN_MAKE_TARGET ?= build
 GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-BUILD_IMAGE := golang:1.15.6
+BUILD_IMAGE := golang:1.17.9
 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
-GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
+GO_MOD_CACHE   ?= /tmp/dokku-go-mod-mod
+GO_ROOT_MOUNT  ?= $$PWD/../..:$(GO_REPO_ROOT)
+GOARCH         ?= amd64
 
 .PHONY: build-in-docker build clean src-clean
 
@@ -12,14 +14,14 @@ build: $(BUILD)
 build-in-docker: clean
 	mkdir -p /tmp/dokku-go-build-cache
 	docker run --rm \
-		-v $$PWD/../..:$(GO_REPO_ROOT) \
+		-v $(GO_ROOT_MOUNT) \
 		-v $(GO_BUILD_CACHE):/root/.cache \
 		-v $(GO_MOD_CACHE):/go/pkg/mod \
 		-e PLUGIN_NAME=$(PLUGIN_NAME) \
 		-e GO111MODULE=on \
 		-w $(GO_REPO_ROOT)/plugins/$(PLUGIN_NAME) \
 		$(BUILD_IMAGE) \
-		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 $(GO_PLUGIN_MAKE_TARGET)" || exit $$?
+		bash -c "GO_ARGS='$(GO_ARGS)' CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) make -j4 $(GO_PLUGIN_MAKE_TARGET)" || exit $$?
 
 clean:
 	rm -rf $(BUILD)

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-update.Dockerfile

@@ -1,16 +0,0 @@
-FROM dokku/build-base:0.0.1
-
-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 WORKDIR=/go/src/github.com/dokku/dokku
-
-WORKDIR ${WORKDIR}
-
-COPY . ${WORKDIR}
-
-RUN make deb-dokku-update rpm-dokku-update
-
-RUN ls -lha /tmp/

contrib/build-dokku.Dockerfile

@@ -1,4 +1,4 @@
-FROM dokku/build-base:0.0.1
+FROM dokku/build-base:0.0.1 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -8,8 +8,8 @@ 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 \
-    && cp /usr/local/go/bin/* /usr/local/bin
+  && tar -C /usr/local -xzf /tmp/go${GOLANG_VERSION}.linux-amd64.tar.gz \
+  && cp /usr/local/go/bin/* /usr/local/bin
 
 ARG WORKDIR=/go/src/github.com/dokku/dokku
 
@@ -18,24 +18,65 @@ WORKDIR ${WORKDIR}
 COPY Makefile ${WORKDIR}/
 COPY *.mk ${WORKDIR}/
 
-RUN make deb-setup rpm-setup sshcommand plugn
+RUN make deb-setup sshcommand plugn
 
 COPY . ${WORKDIR}
 
+ENV GOPATH=/go
+
+FROM builder as amd64
+
 ARG PLUGIN_MAKE_TARGET
 ARG DOKKU_VERSION=master
 ARG DOKKU_GIT_REV
 ARG IS_RELEASE=false
 
-ENV GOPATH=/go
+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 \
+  make version copyfiles \
+  && make deb-dokku
+
+FROM builder as armhf
+
+COPY --from=amd64 /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 \
-    make version copyfiles \
-    && make deb-dokku deb-sigil \
-            rpm-dokku rpm-sigil
+  DOKKU_VERSION=${DOKKU_VERSION} \
+  DOKKU_GIT_REV=${DOKKU_GIT_REV} \
+  IS_RELEASE=${IS_RELEASE} \
+  SKIP_GO_CLEAN=true \
+  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,20 +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 = [
-        "xenial"
-        "focal"
-    ]
+    versions = ["jammy"]
     cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
     for version in versions:
         cmd = cmd_template.format(version, filename)
@@ -26,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-installer.py

@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-
-import cgi
-import json
-import os
-import re
-import shutil
-try:
-    import SimpleHTTPServer
-    import SocketServer
-except ImportError:
-    import http.server as SimpleHTTPServer
-    import socketserver as SocketServer
-import subprocess
-import sys
-import threading
-
-VERSION = 'v0.23.3'
-
-def bytes_to_string(b):
-    if type(b) == bytes:
-        encoding = sys.stdout.encoding
-        if encoding is None:
-            encoding = 'utf-8'
-        b = b.decode(encoding)
-    b = b.strip()
-    return b
-
-
-def string_to_bytes(s):
-    if type(s) == str:
-        encoding = sys.stdout.encoding
-        if encoding is None:
-            encoding = 'utf-8'
-        s = s.encode(encoding)
-    return s
-
-
-hostname = ''
-try:
-    command = "bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'"
-    hostname = bytes_to_string(subprocess.check_output(command, shell=True))
-except subprocess.CalledProcessError:
-    pass
-
-key_file = os.getenv('KEY_FILE', None)
-if os.path.isfile('/home/ec2-user/.ssh/authorized_keys'):
-    key_file = '/home/ec2-user/.ssh/authorized_keys'
-elif os.path.isfile('/home/ubuntu/.ssh/authorized_keys'):
-    key_file = '/home/ubuntu/.ssh/authorized_keys'
-else:
-    key_file = '/root/.ssh/authorized_keys'
-
-admin_keys = []
-if os.path.isfile(key_file):
-    try:
-        command = "cat {0}".format(key_file)
-        admin_keys = bytes_to_string(subprocess.check_output(command, shell=True)).strip().split("\n")
-    except subprocess.CalledProcessError:
-        pass
-
-ufw_display = 'block'
-try:
-    command = "sudo ufw status"
-    ufw_output = bytes_to_string(subprocess.check_output(command, shell=True).strip())
-    if "inactive" in ufw_output:
-        ufw_display = 'none'
-except subprocess.CalledProcessError:
-    ufw_display = 'none'
-
-
-nginx_dir = '/etc/nginx'
-nginx_init = '/etc/init.d/nginx'
-try:
-    command = "test -x /usr/bin/openresty"
-    subprocess.check_output(command, shell=True)
-    nginx_dir = '/usr/local/openresty/nginx/conf'
-    nginx_init = '/etc/init.d/openresty'
-except subprocess.CalledProcessError:
-    pass
-
-
-def check_boot():
-    if 'onboot' not in sys.argv:
-        return
-    init_dir = os.getenv('INIT_DIR', '/etc/init')
-    systemd_dir = os.getenv('SYSTEMD_DIR', '/etc/systemd/system')
-    nginx_conf_dir = os.getenv('NGINX_CONF_DIR', '{0}/conf.d'.format(nginx_dir))
-
-    if os.path.exists(init_dir):
-        with open('{0}/dokku-installer.conf'.format(init_dir), 'w') as f:
-            f.write("start on runlevel [2345]\n")
-            f.write("exec {0} selfdestruct\n".format(os.path.abspath(__file__)))
-    if os.path.exists(systemd_dir):
-        with open('{0}/dokku-installer.service'.format(systemd_dir), 'w') as f:
-            f.write("[Unit]\n")
-            f.write("Description=Dokku web-installer\n")
-            f.write("\n")
-            f.write("[Service]\n")
-            f.write("ExecStart={0} selfdestruct\n".format(os.path.abspath(__file__)))
-            f.write("\n")
-            f.write("[Install]\n")
-            f.write("WantedBy=multi-user.target\n")
-            f.write("WantedBy=graphical.target\n")
-    if os.path.exists(nginx_conf_dir):
-        with open('{0}/dokku-installer.conf'.format(nginx_conf_dir), 'w') as f:
-            f.write("upstream dokku-installer { server 127.0.0.1:2000; }\n")
-            f.write("server {\n")
-            f.write("  listen      80;\n")
-            f.write("  location    / {\n")
-            f.write("    proxy_pass  http://dokku-installer;\n")
-            f.write("  }\n")
-            f.write("}\n")
-
-    subprocess.call('rm -f {0}/sites-enabled/*'.format(nginx_dir), shell=True)
-    sys.exit(0)
-
-
-class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-    def write_content(self, content):
-        try:
-            self.wfile.write(content)
-        except TypeError:
-            self.wfile.write(string_to_bytes(content))
-
-
-    def do_GET(self):
-        content = PAGE.replace('{VERSION}', VERSION)
-        content = content.replace('{UFW_DISPLAY}', ufw_display)
-        content = content.replace('{HOSTNAME}', hostname)
-        content = content.replace('{AUTHORIZED_KEYS_LOCATION}', key_file)
-        content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
-        self.send_response(200)
-        self.end_headers()
-        self.write_content(content)
-
-    def do_POST(self):
-        if self.path not in ['/setup', '/setup/']:
-            return
-
-        params = cgi.FieldStorage(fp=self.rfile,
-                                  headers=self.headers,
-                                  environ={
-                                      'REQUEST_METHOD': 'POST',
-                                      'CONTENT_TYPE': self.headers['Content-Type']})
-
-        dokku_root = os.getenv('DOKKU_ROOT', '/home/dokku')
-        dokku_user = os.getenv('DOKKU_SYSTEM_GROUP', 'dokku')
-        dokku_group = os.getenv('DOKKU_SYSTEM_USER', 'dokku')
-
-        vhost_enable = 'false'
-        vhost_filename = '{0}/VHOST'.format(dokku_root)
-
-        if 'vhost' in params and params['vhost'].value == 'true':
-            vhost_enable = 'true'
-            with open(vhost_filename, 'w') as f:
-                f.write(params['hostname'].value.strip("/"))
-            shutil.chown(vhost_filename, dokku_user, dokku_group)
-        else:
-            try:
-                os.remove(vhost_filename)
-            except OSError:
-                pass
-
-        hostname_filename = '{0}/HOSTNAME'.format(dokku_root)
-
-        with open(hostname_filename, 'w') as f:
-            f.write(params['hostname'].value.strip("/"))
-
-        shutil.chown(hostname_filename, dokku_user, dokku_group)
-
-        for (index, key) in enumerate(params['keys'].value.splitlines(), 1):
-            user = 'admin'
-            if self.admin_user_exists() is not None:
-                user = 'web-admin'
-                if self.web_admin_user_exists() is not None:
-                    index = int(self.web_admin_user_exists()) + 1
-                elif self.web_admin_user_exists() is None:
-                    index = 1
-            elif self.admin_user_exists() is None:
-                pass
-            else:
-                index = int(self.admin_user_exists()) + 1
-            user = user + str(index)
-            command = ['sshcommand', 'acl-add', 'dokku', user]
-            proc = subprocess.Popen(command, stdin=subprocess.PIPE)
-            try:
-                proc.stdin.write(key)
-            except TypeError:
-                proc.stdin.write(string_to_bytes(key))
-            proc.stdin.close()
-            proc.wait()
-
-        set_debconf_selection('boolean', 'nginx_enable', 'true')
-        set_debconf_selection('boolean', 'skip_key_file', 'true')
-        set_debconf_selection('boolean', 'vhost_enable', vhost_enable)
-        set_debconf_selection('boolean', 'web_config', 'false')
-        set_debconf_selection('string', 'hostname', params['hostname'].value)
-
-        if 'selfdestruct' in sys.argv:
-            DeleteInstallerThread()
-
-        content = json.dumps({'status': 'ok'})
-
-        self.send_response(200)
-        self.end_headers()
-        self.write_content(content)
-
-    def web_admin_user_exists(self):
-        return self.user_exists('web-admin(\d+)')
-
-    def admin_user_exists(self):
-        return self.user_exists('admin(\d+)')
-
-    def user_exists(self, name):
-        command = 'dokku ssh-keys:list'
-        pattern = re.compile(r'NAME="' + name + '"')
-        proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
-        max_num = 0
-        exists = False
-        for line in proc.stdout:
-            m = pattern.search(bytes_to_string(line))
-            if m:
-                # User of the form `user` or `user#` exists
-                exists = True
-                max_num = max(max_num, int(m.group(1)))
-        if exists:
-            return max_num
-        else:
-            return None
-
-
-def set_debconf_selection(debconf_type, key, value):
-    found = False
-    with open('/etc/os-release', 'r') as f:
-        for line in f:
-            if 'debian' in line:
-                found = True
-
-    if not found:
-        return
-
-    ps = subprocess.Popen(['echo', 'dokku dokku/{0} {1} {2}'.format(
-        key, debconf_type, value
-    )], stdout=subprocess.PIPE)
-
-    try:
-        subprocess.check_output(['debconf-set-selections'], stdin=ps.stdout)
-    except subprocess.CalledProcessError:
-        pass
-
-    ps.wait()
-
-
-class DeleteInstallerThread(object):
-    def __init__(self, interval=1):
-        thread = threading.Thread(target=self.run, args=())
-        thread.daemon = True
-        thread.start()
-
-    def run(self):
-        command = "rm {0}/conf.d/dokku-installer.conf && {1} stop && {1} start".format(nginx_dir, nginx_init)
-        try:
-            subprocess.call(command, shell=True)
-        except:
-            pass
-
-        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && (stop dokku-installer || systemctl stop dokku-installer.service)"
-        try:
-            subprocess.call(command, shell=True)
-        except:
-            pass
-
-
-def main():
-    check_boot()
-
-    port = int(os.getenv('PORT', 2000))
-    httpd = SocketServer.TCPServer(("", port), GetHandler)
-    print("Listening on 0.0.0.0:{0}, CTRL+C to stop".format(port))
-    httpd.serve_forever()
-
-
-PAGE = """
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>Dokku Setup</title>
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-  <style>
-    .bd-callout {
-      padding: 1.25rem;
-      margin-top: 1.25rem;
-      margin-bottom: 1.25rem;
-      border: 1px solid #eee;
-      border-left-width: .25rem;
-      border-radius: .25rem;
-    }
-    .bd-callout p:last-child {
-      margin-bottom: 0;
-    }
-    .bd-callout-info {
-      border-left-color: #5bc0de;
-    }
-    pre {
-      font-size: 80%;
-      margin-bottom: 0;
-    }
-    h1 small {
-      font-size: 50%;
-    }
-    h5 {
-      font-size: 1rem;
-    }
-    .container {
-      width: 640px;
-    }
-    .result {
-      padding-left: 20px;
-    }
-    input.form-control, textarea.form-control {
-      background-color: #fafbfc;
-      font-size: 14px;
-    }
-    input.form-control::placeholder, textarea.form-control::placeholder {
-      color:  #adb2b8
-    }
-  </style>
-</head>
-<body>
-  <div class="container">
-    <form id="form" role="form">
-      <h1 class="pt-3">Dokku Setup <small class="text-muted">{VERSION}</small></h1>
-      <div class="alert alert-warning small" role="alert">
-        <strong>Warning:</strong> The SSH key filled out here can grant root access to the server. Please complete the setup as soon as possible.
-      </div>
-
-      <div class="row">
-        <div class="col">
-          <h3>Admin Access</h3>
-          <div class="form-group">
-            <label for="key">Public SSH Keys</label><br />
-            <textarea class="form-control" name="keys" rows="5" id="key" placeholder="Begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'">{ADMIN_KEYS}</textarea>
-            <small class="form-text text-muted">Public keys allow users to ssh onto the server as the <code>dokku</code> user, as well as remotely execute Dokku commands. They are currently auto-populated from: <code>{AUTHORIZED_KEYS_LOCATION}</code>, and can be changed later via the  <a href="http://dokku.viewdocs.io/dokku/deployment/user-management/" target="_blank"><code>dokku ssh-keys</code></a> plugin.</small>
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col">
-          <h3>Hostname Configuration</h3>
-          <div class="form-group">
-            <label for="hostname">Hostname</label>
-            <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" placeholder="A hostname or ip address such as {HOSTNAME}" />
-            <small class="form-text text-muted">This will be used as the default host for all applications, and can be changed later via the <a href="http://dokku.viewdocs.io/dokku/configuration/domains/" target="_blank"><code>dokku domains:set-global</code></a> command.</small>
-          </div>
-          <div class="form-check">
-            <input class="form-check-input" type="checkbox" id="vhost" name="vhost" value="true">
-            <label class="form-check-label" for="vhost">Use virtualhost naming for apps</label>
-            <small class="form-text text-muted">When enabled, Nginx will be run on port 80 and proxy requests to apps based on hostname.</small>
-            <small class="form-text text-muted">When disabled, a specific port will be setup for each application on first deploy, and requests to that port will be proxied to the relevant app.</small>
-          </div>
-          <div class="alert alert-warning small mt-3 d-{UFW_DISPLAY}" role="alert">
-            <strong>Warning:</strong> UFW is active. To allow traffic to specific ports, run <code>sudo ufw allow PORT</code> for the port in question.
-          </div>
-          <div class="bd-callout bd-callout-info">
-            <h5>What will app URLs look like?</h5>
-            <pre><code id="example">http://hostname:port</code></pre>
-          </div>
-        </div>
-      </div>
-      <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span class="result"></span>
-    </form>
-  </div>
-
-  <div id="error-output"></div>
-  <script>
-    var $ = document.querySelector.bind(document)
-
-    function setup() {
-      if ($("#key").value.trim() == "") {
-        alert("Your admin public key cannot be blank.")
-        return
-      }
-      if ($("#hostname").value.trim() == "") {
-        alert("Your hostname cannot be blank.")
-        return
-      }
-      var data = new FormData($("#form"))
-
-      var inputs = [].slice.call(document.querySelectorAll("input, textarea, button"))
-      inputs.forEach(function (input) {
-        input.disabled = true
-      })
-
-      var result = $(".result")
-      fetch("/setup", {method: "POST", body: data})
-        .then(function(response) {
-            if (response.ok) {
-                return response.json()
-            } else {
-                throw new Error('Server returned error')
-            }
-        })
-        .then(function(response) {
-          result.classList.add("text-success");
-          result.textContent = "Success! Redirecting in 3 seconds. .."
-          setTimeout(function() {
-            window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
-          }, 3000);
-        })
-        .catch(function (error) {
-          result.classList.add("text-danger");
-          result.textContent = "Could not send the request"
-        })
-    }
-
-    function update() {
-      if ($("#vhost").matches(":checked") && $("#hostname").value.match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
-        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-        $("#vhost").checked = false;
-      }
-      if ($("#vhost").matches(':checked')) {
-        $("#example").textContent = "http://<app-name>."+$("#hostname").value
-      } else {
-        $("#example").textContent = "http://"+$("#hostname").value+":<app-port>"
-      }
-    }
-    $("#vhost").addEventListener("change", update);
-    $("#hostname").addEventListener("input", update);
-    update();
-  </script>
-</body>
-</html>
-"""
-
-if __name__ == "__main__":
-    main()

contrib/dokku-update

@@ -1,112 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-shopt -s nullglob
-
-if [[ -r /etc/default/dokku ]]; then
-  # shellcheck disable=SC1091
-  source /etc/default/dokku
-fi
-
-export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
-if [[ -f "$DOKKU_ROOT/dokkurc" ]]; then
-  if [[ -r $DOKKU_ROOT/dokkurc ]]; then
-    source "$DOKKU_ROOT/dokkurc"
-  else
-    echo "Unable to read $DOKKU_ROOT/dokkurc for sourcing" 1>&2
-    exit 1
-  fi
-fi
-if [[ -d $DOKKU_ROOT/.dokkurc ]]; then
-  for f in $DOKKU_ROOT/.dokkurc/*; do
-    if [[ -r "$f" ]]; then
-      source "$f"
-    else
-      echo "Unable to read $f for sourcing" 1>&2
-      exit 1
-    fi
-  done
-fi
-[[ $DOKKU_TRACE ]] && set -x
-
-export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
-export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
-export PLUGIN_ENABLED_PATH=${PLUGIN_ENABLED_PATH:="$PLUGIN_PATH/enabled"}
-export DEBIAN_FRONTEND=noninteractive
-
-dokku-log-info() {
-  declare desc="log info formatter"
-  echo "-----> $*"
-}
-
-dokku-log-verbose() {
-  declare desc="log verbose formatter"
-  echo "       $*"
-}
-
-dokku-log-warn() {
-  declare desc="log warning formatter"
-  echo " !     $*" 1>&2
-}
-
-dokku-update-plugin() {
-  declare PLUGIN_NAME="$1"
-  if [[ -d "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/.git" ]]; then
-    dokku-log-verbose "Updating $PLUGIN_NAME"
-    dokku plugin:update "$PLUGIN_NAME"
-  fi
-}
-
-main() {
-  declare COMMAND="$1"
-  local DOKKU_DISTRO PLUGIN_NAME VERSION
-
-  if [[ -f "/etc/os-release" ]]; then
-    # shellcheck disable=SC1091
-    DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
-  fi
-
-  if [[ "$COMMAND" == "version" ]] || [[ "$COMMAND" == "-v" ]]; then
-    VERSION=UNRELEASED
-    if [[ -f "/var/lib/dokku-update/VERSION" ]]; then
-      VERSION="$(cat /var/lib/dokku-update/VERSION)"
-    fi
-    echo "dokku-update ${VERSION}"
-    exit 0
-  fi
-
-  dokku-log-info "Running system updates"
-  case "$DOKKU_DISTRO" in
-    arch)
-      yay -Syyua
-      ;;
-    debian | ubuntu)
-      apt-get update -qq >/dev/null
-      apt-get -qq -y dist-upgrade
-      ;;
-    centos | opensuse | rhel)
-      dokku-log-warn "Updating this operating system is not supported"
-      ;;
-    *)
-      dokku-log-warn "Updating this operating system is not supported"
-      exit 1
-      ;;
-  esac
-
-  # update all plugins
-  dokku-log-info "Updating all plugins"
-  for PLUGIN_NAME in $(dokku plugin:list | grep enabled | awk '$1=$1' | cut -d' ' -f1); do
-    dokku-update-plugin "$PLUGIN_NAME"
-  done
-  dokku plugin:install
-
-  # rebuild all applications
-  dokku-log-info "Rebuilding all applications"
-  dokku ps:rebuild --all
-
-  dokku-log-info "Waiting for old containers to stop"
-  sleep 120
-  dokku-log-info "Cleaning up"
-  dokku cleanup --global
-}
-
-main "$@"

contrib/dokku_client.sh

@@ -55,7 +55,7 @@ fn-dokku-host() {
   fi
 
   if [[ -z "$DOKKU_HOST" ]]; then
-    fn-client-help-msg
+    return
   fi
 
   echo "$DOKKU_HOST"
@@ -100,11 +100,14 @@ main() {
   done
 
   DOKKU_REMOTE_HOST="$(fn-dokku-host "$DOKKU_GIT_REMOTE" "$DOKKU_HOST")"
+  if [[ -z "$DOKKU_REMOTE_HOST" ]]; then
+    fn-client-help-msg
+  fi
 
   if [[ -z "$APP" ]]; then
     if [[ -d .git ]] || git rev-parse --git-dir >/dev/null 2>&1; then
       set +e
-      APP=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_REMOTE_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
+      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
     else
       echo " !     This is not a git repository" 1>&2
@@ -157,7 +160,7 @@ main() {
   }
 }
 
-if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
+if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(command -v dokku) ]]; then
   main "$@"
   exit $?
 fi

contrib/release-dokku

@@ -6,7 +6,7 @@ readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 
-trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
@@ -49,6 +49,7 @@ fn-build-dokku() {
     --build-arg IS_RELEASE="$IS_RELEASE" \
     --build-arg PLUGIN_MAKE_TARGET="build" \
     --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
+    --progress plain \
     -f "contrib/build-dokku.Dockerfile" \
     -t "$NAME" .
   return "$?"
@@ -133,10 +134,20 @@ 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 [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("xenial" "bionic" "focal")
+  if [[ "$RELEASE_TYPE" == "raspbian" ]]; then
+    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"
+      ex="$?"
+      if [[ "$ex" -ne "0" ]]; then
+        EXIT_CODE="$ex"
+      fi
+    done
+  elif [[ "$DIST" == "ubuntu" ]]; then
+    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"
@@ -147,7 +158,7 @@ fn-publish-package() {
     done
 
     DIST=debian
-    OS_IDS=("stretch" "buster")
+    OS_IDS=("buster" "bullseye")
     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"
@@ -204,7 +215,6 @@ fn-repo-update() {
     return
   fi
 
-  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" contrib/dokku-installer.py
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" debian/control
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" Dockerfile
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/advanced-usage/plugin-management.md
@@ -213,7 +223,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
@@ -339,8 +349,22 @@ 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" .
+  else
+    docker buildx build \
+      --platform linux/arm,linux/arm64,linux/amd64 \
+      --progress plain \
+      --tag "dokku/dokku:latest" \
+      --tag "dokku/dokku:$(echo "$VERSION" | tr + -)" .
+  fi
 }
 
 main() {
@@ -376,32 +400,33 @@ main() {
   NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
+  echo "v${NEXT_VERSION}" >build/next-version
+
   fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
   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-dokku-update

@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $TRACE ]] && set -x
-
-readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
-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
-}
-
-fn-build-dokku() {
-  declare desc="Builds dokku packages within a docker container"
-
-  pushd "$ROOT_DIR" >/dev/null
-  docker build \
-    -f "contrib/build-dokku-update.Dockerfile" \
-    -t dokku-update:build .
-  return "$?"
-}
-
-fn-extract-package() {
-  declare desc="Extract packages from a docker container to the root directory"
-  declare PACKAGE_NAME="$1"
-
-  if [[ -z "$PACKAGE_NAME" ]]; then
-    log-error "Invalid deb file specified"
-    return 1
-  fi
-
-  log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
-  docker run --rm --entrypoint cat dokku-update:build "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${PACKAGE_NAME}"
-  return "$?"
-}
-
-fn-publish-package() {
-  declare desc="Publishes a package to packagecloud"
-  declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
-  local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
-  local OS_ID ex EXIT_CODE=0
-
-  [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
-  [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
-
-  if [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("xenial" "bionic" "focal")
-    for OS_ID in "${OS_IDS[@]}"; do
-      log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
-      package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
-      ex="$?"
-      if [[ "$ex" -ne "0" ]]; then
-        EXIT_CODE="$ex"
-      fi
-    done
-
-    DIST=debian
-    OS_IDS=("stretch" "buster")
-    for OS_ID in "${OS_IDS[@]}"; do
-      log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
-      package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
-      ex="$?"
-      if [[ "$ex" -ne "0" ]]; then
-        EXIT_CODE="$ex"
-      fi
-    done
-  else
-    log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
-    package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
-    EXIT_CODE="$?"
-  fi
-  return "$EXIT_CODE"
-}
-
-fn-in-array() {
-  declare desc="return true if value ($1) is in list (all other arguments)"
-
-  local e
-  for e in "${@:2}"; do
-    [[ "$e" == "$1" ]] && return 0
-  done
-  return 1
-}
-
-fn-is-release() {
-  declare desc="Checks if a given run is a release run"
-  declare RELEASE="$1"
-  local IS_RELEASE=false
-  if [[ "$RELEASE" == "major" ]] || [[ "$RELEASE" == "minor" ]] || [[ "$RELEASE" == "patch" ]]; then
-    IS_RELEASE=true
-  fi
-
-  echo "$IS_RELEASE"
-}
-
-fn-require-bin() {
-  declare desc="Checks that a binary exists"
-  declare BINARY="$1"
-  if ! command -v "$BINARY" &>/dev/null; then
-    log-fail "Missing ${BINARY}, please install it"
-  fi
-}
-
-main() {
-  declare RELEASE="$1"
-  local NEXT_VERSION
-  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build")
-
-  if [[ "$RELEASE" == '--trace' ]]; then
-    shift 1
-    RELEASE="$1"
-    TRACE=1 && set -x
-  fi
-
-  if [[ -z "$RELEASE" ]]; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given"
-  fi
-
-  if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
-  fi
-
-  mkdir -p "build"
-  fn-require-bin "docker"
-  if [[ "$RELEASE" != "build" ]]; then
-    fn-require-bin "package_cloud"
-    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
-  fi
-
-  NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
-  IS_RELEASE="$(fn-is-release "$RELEASE")"
-
-  fn-build-dokku || log-fail "Error building package"
-  fn-extract-package "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
-  fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
-
-  if [[ "$RELEASE" != "build" ]]; then
-    fn-publish-package "$IS_RELEASE" "deb" "build/dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
-    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
-  fi
-}
-
-main "$@"

contrib/release-plugin

@@ -4,7 +4,7 @@ set -eo pipefail
 
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXXXX")"
 
-trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034

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,344 @@
+#!/usr/bin/env python
+from bs4 import BeautifulSoup
+import os
+import pathlib
+import shutil
+import sys
+import yaml
+
+
+def get_nav_from_selector(soup, selector, docs_dir):
+    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
+                elif 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
+                else:
+                    nav[header_name].append(filename)
+    return navigation
+
+
+def generate_nav(src, dest):
+    navigation = []
+    repo_dir = pathlib.Path(__file__).parent.parent.resolve()
+    docs_dir = str(repo_dir) + "/docs"
+    with open(docs_dir + "/template.html") 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) as f:
+        data = yaml.unsafe_load(f)
+        data["nav"] = [
+            {"Docs": navigation},
+            {"Pro": "https://pro.dokku.com/docs/getting-started/"},
+            {"Blog": "https://dokku.com/blog/"},
+            {"Purchase Dokku Pro": "https://dokku.dpdcart.com/cart/add?product_id=217344&method_id=236878"},
+        ]
+
+    with open(dest, mode="wt", encoding="utf-8") as f:
+        yaml.dump(data, f)
+
+
+def modify_content_noop(lines, _):
+    modified = False
+    updated_lines = []
+    for line in lines:
+        updated_lines.append(line)
+    return updated_lines, modified
+
+
+def modify_content_links(lines, filename):
+    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, _):
+    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, _):
+    modified = False
+    updated_lines = []
+    for line in lines:
+        updated_lines.append(line.rstrip() + "\n")
+    return updated_lines, modified
+
+
+def is_info(line):
+    return line.startswith("> ")
+
+
+def is_new(line):
+    return line.startswith("> ") and "new as of" in line.lower()
+
+
+def is_note(line):
+    return line.startswith("> Note:")
+
+
+def is_warning(line):
+    return line.startswith("> Warning:")
+
+
+def modify_content_admonition(lines, _):
+    modified = False
+    updated_lines = []
+    admonition_lines = []
+    is_admonition = False
+    for line in lines:
+        if is_info(line) or is_new(line) or is_note(line) or is_warning(line):
+            if is_new(line):
+                line = line.replace("> ", "!!! tip \"New\"\n\n    ")
+                line = line.replace("New as of", "Introduced in")
+                line = line.replace("new as of", "introduced in")
+            if is_note(line):
+                line = line.replace(
+                    "> Note: ", "!!! note \"Note\"\n\n    ")
+            elif is_warning(line):
+                line = line.replace(
+                    "> Warning: ", "!!! warning \"Warning\"\n\n    ")
+            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:
+                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):
+    return line == "```shell"
+
+
+def modify_content_terminal_example(lines, _):
+    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
+            elif 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
+            elif 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):
+    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 = [
+        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:
+        modified = False
+        lines = []
+        with open(file, 'r') as f:
+            lines = f.readlines()
+            for modifier in modifiers:
+                lines, m = modifier(lines, file)
+                if m:
+                    modified = True
+
+        if modified:
+            with open(file, 'w') as fp:
+                fp.writelines(lines)
+
+
+def main():
+    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

@@ -1,35 +1,14 @@
-BUILD_DIRECTORY ?= /tmp
-
-DOKKU_DESCRIPTION = 'Docker powered PaaS that helps you build and manage the lifecycle of applications'
-DOKKU_REPO_NAME ?= dokku/dokku
-DOKKU_ARCHITECTURE = amd64
-
-DOKKU_UPDATE_DESCRIPTION = 'Binary that handles updating Dokku and related systems'
-DOKKU_UPDATE_REPO_NAME ?= dokku/dokku
-DOKKU_UPDATE_VERSION ?= 0.2.0
-DOKKU_UPDATE_ARCHITECTURE = amd64
-DOKKU_UPDATE_PACKAGE_NAME = dokku-update_$(DOKKU_UPDATE_VERSION)_$(DOKKU_UPDATE_ARCHITECTURE).deb
-
-define SIGIL_DESCRIPTION
-Standalone string interpolator and template processor
-Sigil is a command line tool for template processing
-and POSIX-compliant variable expansion. It was created
-for configuration templating, but can be used for any
-text processing.
-endef
-SIGIL_REPO_NAME ?= gliderlabs/sigil
-SIGIL_VERSION ?= 0.4.0
-SIGIL_ARCHITECTURE = amd64
-SIGIL_PACKAGE_NAME = gliderlabs_sigil_$(SIGIL_VERSION)_$(SIGIL_ARCHITECTURE).deb
-SIGIL_URL = https://github.com/gliderlabs/sigil/releases/download/v$(SIGIL_VERSION)/sigil_$(SIGIL_VERSION)_Linux_x86_64.tgz
+BUILD_DIRECTORY    ?= /tmp
+DOKKU_DESCRIPTION   = 'Docker powered PaaS that helps you build and manage the lifecycle of applications'
+DOKKU_REPO_NAME    ?= dokku/dokku
+DOKKU_ARCHITECTURE ?= amd64
 
 ifndef IS_RELEASE
 	IS_RELEASE = true
 endif
 
-export SIGIL_DESCRIPTION
 
-.PHONY: install-from-deb deb-all deb-dokku deb-dokku-update deb-setup deb-sigil
+.PHONY: install-from-deb deb-all deb-dokku deb-setup
 
 install-from-deb:
 	@echo "--> Initial apt-get update"
@@ -40,12 +19,12 @@ install-from-deb:
 	wget -nv -O - https://get.docker.com/ | sh
 
 	@echo "--> Installing dokku"
-	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
+	wget -qO- https://packagecloud.io/dokku/dokku/gpgkey | sudo tee /etc/apt/trusted.gpg.d/dokku.asc
 	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "bionic") main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq >/dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install dokku
 
-deb-all: deb-setup deb-dokku deb-sigil deb-dokku-update
+deb-all: deb-setup deb-dokku
 	mv $(BUILD_DIRECTORY)/*.deb .
 	@echo "Done"
 
@@ -65,45 +44,9 @@ ifneq (,$(findstring false,$(IS_RELEASE)))
 endif
 
 	cp -r debian /tmp/build-dokku/DEBIAN
+	sed -i.bak "s/^Architecture: .*/Architecture: $(DOKKU_ARCHITECTURE)/g" /tmp/build-dokku/DEBIAN/control && rm  /tmp/build-dokku/DEBIAN/control.bak
 	rm -f /tmp/build-dokku/DEBIAN/lintian-overrides
 	cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
 	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
 	dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
-	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
-
-deb-dokku-update:
-	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
-	echo "${DOKKU_UPDATE_VERSION}" > contrib/dokku-update-version
-	sudo fpm -t deb -s dir -n dokku-update \
-			 --version $(DOKKU_UPDATE_VERSION) \
-			 --architecture $(DOKKU_UPDATE_ARCHITECTURE) \
-			 --package $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_PACKAGE_NAME) \
-			 --depends 'dokku' \
-			 --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \
-			 --description $(DOKKU_UPDATE_DESCRIPTION) \
-			 --license 'MIT License' \
-			 contrib/dokku-update=/usr/local/bin/dokku-update \
-			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION
-
-deb-sigil:
-	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin
-
-	@echo "-> Downloading package"
-	wget -q -O /tmp/tmp/sigil-$(SIGIL_VERSION).tgz $(SIGIL_URL)
-	cd /tmp/tmp/ && tar zxf /tmp/tmp/sigil-$(SIGIL_VERSION).tgz
-
-	@echo "-> Copying files into place"
-	cp /tmp/tmp/sigil /tmp/build/usr/bin/sigil && chmod +x /tmp/build/usr/bin/sigil
-
-	@echo "-> Creating $(SIGIL_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n gliderlabs-sigil \
-			 --version $(SIGIL_VERSION) \
-			 --architecture $(SIGIL_ARCHITECTURE) \
-			 --package $(BUILD_DIRECTORY)/$(SIGIL_PACKAGE_NAME) \
-			 --url "https://github.com/$(SIGIL_REPO_NAME)" \
-			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
-			 --category utils \
-			 --description "$$SIGIL_DESCRIPTION" \
-			 --license 'MIT License' \
-			 .
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" || true

debian/config

@@ -10,14 +10,6 @@ fi
 readonly ACTION="${1:-configure}"
 readonly VERSION="${2:-dev}"
 
-db_input "high" "dokku/web_config" || true
-db_go || true
-
-db_get "dokku/web_config"
-if [ $RET = "true" ]; then
-  exit 0
-fi
-
 db_input "high" "dokku/nginx_enable" || true
 db_input "high" "dokku/hostname" || true
 db_input "high" "dokku/vhost_enable" || true

debian/control

@@ -1,10 +1,10 @@
 Package: dokku
-Version: 0.23.3
+Version: 0.28.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, software-properties-common, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsyslog, dos2unix, jq
-Recommends: herokuish (>= 0.3.4), parallel, dokku-update, dokku-event-listener
+Depends: apache2-utils, 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), lambda-builder, 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
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker-powered PaaS that helps build and manage the lifecycle of applications

debian/lintian-overrides

@@ -10,6 +10,3 @@ dokku: hardening-no-relro
 
 # Built golang binaries link to libc
 dokku: missing-dependency-on-libc
-
-# Temporary python dependency until #2247 is resolved
-dokku: python-script-but-no-python-dep usr/share/dokku/contrib/dokku-installer.py

debian/postinst

@@ -43,6 +43,20 @@ setup-storage() {
 }
 
 setup-plugins() {
+  echo "Deleting invalid plugins"
+  if [ -f "${DOKKU_LIB_ROOT}/core-plugins/available/" ]; then
+    find "${DOKKU_LIB_ROOT}/core-plugins/available/" -type d -empty -delete
+  fi
+  if [ -f "${DOKKU_LIB_ROOT}/core-plugins/enabled/" ]; then
+    find "${DOKKU_LIB_ROOT}/core-plugins/enabled/" -type d -empty -delete
+  fi
+  if [ -f "${DOKKU_LIB_ROOT}/plugins/available/" ]; then
+    find "${DOKKU_LIB_ROOT}/plugins/available/" -type d -empty -delete
+  fi
+  if [ -f "${DOKKU_LIB_ROOT}/plugins/enabled/" ]; then
+    find "${DOKKU_LIB_ROOT}/plugins/enabled/" -type d -empty -delete
+  fi
+
   echo "Setting up plugin directories"
   # should be replaced by `plugn init`
   mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/available" "${DOKKU_LIB_ROOT}/plugins/available"
@@ -88,40 +102,7 @@ setup-sshcommand() {
   fi
 }
 
-setup-dokku-installer() {
-  NGINX_ROOT="/etc/nginx"
-  [[ -x /usr/bin/openresty ]] && NGINX_ROOT="/usr/local/openresty/nginx/conf"
-
-  if command -v "python3" &>/dev/null; then
-    sed -i '1 s/^.*$/#!\/usr\/bin\/env python3/' /usr/share/dokku/contrib/dokku-installer.py
-  elif command -v "python2.7" &>/dev/null; then
-    sed -i '1 s/^.*$/#!\/usr\/bin\/env python2.7/' /usr/share/dokku/contrib/dokku-installer.py
-  fi
-
-  if [[ -f "$NGINX_ROOT/conf.d/dokku-installer.conf" ]]; then
-    echo "Setting up dokku-installer"
-    /usr/share/dokku/contrib/dokku-installer.py onboot
-
-    if command -v systemctl &>/dev/null; then
-      echo "Enabling dokku-installer"
-      systemctl enable dokku-installer
-    fi
-
-    installer_status="$(service dokku-installer status 2>/dev/null || true)"
-    if echo $installer_status | grep -Eq "(inactive|waiting)" >/dev/null; then
-      echo "Starting dokku-installer"
-      service dokku-installer start || echo "Unable to start dokku-installer"
-    fi
-  fi
-}
-
 dpkg-handling() {
-  db_get "dokku/web_config"
-  if [ "$RET" = "true" ]; then
-    db_stop
-    exit 0
-  fi
-
   if [ -f "${DOKKU_ROOT}/VHOST" ]; then
     echo "VHOST file detected, skipping modification"
   else
@@ -130,12 +111,10 @@ 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
 
-  db_get "dokku/hostname"
-  echo "$RET" >"${DOKKU_ROOT}/HOSTNAME"
-
   if [ -z "${DEBCONF_RECONFIGURE}" ]; then
     db_get "dokku/key_file"
     if [ -f "$RET" ]; then
@@ -157,10 +136,10 @@ case "$1" in
 
     setup-user
     setup-storage
+
+    dpkg-handling
     setup-plugins
     setup-sshcommand
-    setup-dokku-installer
-    dpkg-handling
     ;;
 
   *)

debian/preinst

@@ -7,55 +7,8 @@ if [[ -e /usr/share/debconf/confmodule ]]; then
   . /usr/share/debconf/confmodule
 fi
 
-setup_dokku_installer() {
-  NGINX_BASE_PATH="$1"
-  NGINX_INIT_NAME="$2"
-
-  NGINX_CONF="${NGINX_BASE_PATH}/conf.d/dokku-installer.conf"
-
-  rm -f $NGINX_CONF
-  touch $NGINX_CONF
-
-  {
-    echo 'upstream dokku-installer { server 127.0.0.1:2000; }'
-    echo 'server {'
-    echo '  listen      80;'
-    echo '  location    / {'
-    echo '    proxy_pass  http://dokku-installer;'
-    echo '  }'
-    echo '}'
-  } >>$NGINX_CONF
-
-  rm -f $NGINX_BASE_PATH/sites-enabled/*
-  DOKKU_DISTRO="$(
-    . /etc/os-release >/dev/null 2>&1 || true
-    echo "$ID"
-  )"
-  case "$DOKKU_DISTRO" in
-    debian)
-      /usr/sbin/invoke-rc.d "$NGINX_INIT_NAME" reload || /usr/sbin/invoke-rc.d "$NGINX_INIT_NAME" start
-      ;;
-    ubuntu)
-      if [[ -x /usr/bin/sv ]]; then
-        /usr/bin/sv reload "$NGINX_INIT_NAME" || /usr/bin/sv start "$NGINX_INIT_NAME"
-      else
-        "/etc/init.d/$NGINX_INIT_NAME" reload || "/etc/init.d/$NGINX_INIT_NAME" start
-      fi
-      ;;
-  esac
-}
-
 case "$1" in
   install)
-    db_get "dokku/web_config"
-    if [ "$RET" = "true" ]; then
-      if [[ -x /usr/bin/openresty ]]; then
-        setup_dokku_installer "/usr/local/openresty/nginx/conf" "openresty"
-      else
-        setup_dokku_installer "/etc/nginx" "nginx"
-      fi
-    fi
-
     db_get "dokku/skip_key_file"
     if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
       db_get "dokku/key_file"

debian/templates

@@ -1,8 +1,3 @@
-Template: dokku/web_config
-Description: Enable the web-based config page?
-Type: boolean
-Default: true
-
 Template: dokku/vhost_enable
 Description: Enable vhost-based deployments?
 Type: boolean

docker/etc/my_init.d/10_dokku_init

@@ -12,9 +12,20 @@ log-fail() {
   exit 1
 }
 
+support-userns() {
+  chown 0:0 /usr/bin/sudo
+  chmod 4755 /usr/bin/sudo
+  chown 0:0 /usr/lib/sudo/sudoers.so
+  chown -R 0:0 /etc/sudoers
+  chown -R 0:0 /etc/sudoers.d
+  chown -R 0:0 /run/sshd
+}
+
 main() {
   local NGINX_ROOT
 
+  support-userns
+
   if [[ ! -d /mnt/dokku ]]; then
     log-info "Creating missing /mnt/dokku"
     mkdir -p /mnt/dokku
@@ -51,6 +62,12 @@ main() {
     echo "export DOCKER_BIN=/usr/local/bin/docker" >"/home/dokku/.dokkurc/DOCKER_BIN"
   fi
 
+  if [[ -n "$DOKKU_HOST_ROOT" ]]; then
+    touch /etc/default/dokku
+    echo "export DOKKU_HOST_ROOT=$DOKKU_HOST_ROOT" >>/etc/default/dokku
+    chown dokku:dokku /etc/default/dokku
+  fi
+
   NGINX_ROOT="/etc/nginx"
   if [[ -x /usr/bin/openresty ]]; then
     NGINX_ROOT="/usr/local/openresty/nginx/conf"

docker/etc/sudoers.d/dokku-docker

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

docker/usr/local/bin/pack

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $TRACE ]] && set -x
+
+main() {
+  declare desc="re-runs pack commands as sudo"
+  local PACK_BIN=""
+  if [[ -x "/usr/bin/pack" ]]; then
+    PACK_BIN="/usr/bin/pack"
+  fi
+
+  if [[ -z "$PACK_BIN" ]]; then
+    echo "!   No pack binary found" 1>&2
+    exit 1
+  fi
+
+  sudo -E "$PACK_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.10-alpine
+
+WORKDIR /usr/src/app
+
+COPY docs/_build/requirements.txt .
+
+RUN apk add --no-cache bash 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,30 @@
+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 ^~ /nginx.conf.d/ {
+      return 404;
+    }
+
+    location / {
+      try_files $uri $uri/ =404;
+    }
+  }
+}

docs/_build/entrypoint

@@ -0,0 +1,39 @@
+#!/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
+    pip freeze
+    return $?
+  fi
+
+  if [[ "$CMD" == "serve" ]]; then
+    write-mkdocs
+    mkdocs serve -a 0.0.0.0:3487
+    return $?
+  fi
+
+  "$CMD" "${ARGS[@]}"
+}
+
+main "$@"

docs/_build/requirements.txt

@@ -0,0 +1,23 @@
+beautifulsoup4==4.11.1
+click==8.1.3
+ghp-import==2.1.0
+importlib-metadata==4.12.0
+Jinja2==3.1.2
+Markdown==3.3.7
+MarkupSafe==2.1.1
+mergedeep==1.3.4
+mkdocs==1.3.1
+mkdocs-exclude==1.0.2
+mkdocs-material==8.4.2
+mkdocs-material-extensions==1.0.3
+packaging==21.3
+Pygments==2.13.0
+pymdown-extensions==9.5
+pyparsing==3.0.9
+python-dateutil==2.8.2
+PyYAML==6.0
+pyyaml_env_tag==0.1
+six==1.16.0
+soupsieve==2.3.2.post1
+watchdog==2.1.9
+zipp==3.8.1

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

@@ -32,7 +32,7 @@ To extract the backup onto another server, copy the backup to the server and ext
 sudo tar -xzvf path/to/dokku/backup.tar.gz -C /
 ```
 
-At this point, all datastores should be individually started and checked for data integrity. Once this is complete, individual applications can be rebuilt. Please consult the [process management documentation](/docs/deployment/process-management.md#rebuilding-apps) for more information on how to rebuild applications.
+At this point, all datastores should be individually started and checked for data integrity. Once this is complete, individual apps can be rebuilt. Please consult the [process management documentation](/docs/processes/process-management.md#rebuilding-apps) for more information on how to rebuild apps.
 
 ## Caveats
 
@@ -56,9 +56,15 @@ git remote add dokku dokku@[dokku.me:dokku.me]
 git push dokku [master]
 ```
 
+### Docker Networks
+
+Docker networks generated by Dokku should be recreated. Running `dokku network:report` will output all networks in use by various apps, which can then be used to recreate them via `dokku network:create $NETWORK`.
+
+Networks created by tools other than Dokku may be created as they initially were.
+
 ### Docker Image and Tar-based Apps
 
-These applications may fail to rebuild via the normal `ps:rebuild` method. Redeploy these apps by running the original commands used to deploy them
+These apps may fail to rebuild via the normal `ps:rebuild` method. Redeploy these apps by running the original commands used to deploy them
 
 ### Datastores
 
@@ -81,14 +87,13 @@ The plugin directory is contained at the `/var/lib/dokku/plugins` directory. Cor
 
 Note that restoring a plugin will not trigger any `install` or `dependencies` triggers. You will need to run these manually. See the [plugin management documentation](/docs/advanced-usage/plugin-management.md#installing-a-plugin) for more information on how to trigger these two hooks.
 
-
 ### Volumes and Static Assets
 
 Dokku doesn't enforce a [300mb](https://devcenter.heroku.com/articles/slug-compiler#slug-size) limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The Dokku storage core plugin can be used to mount local directories / volumes inside the docker container.
 
 System administrators are highly encouraged to store persistent data in app-specific subdirectories of the path `/var/lib/dokku/data/storage`. This will help ensure restores of the aforementioned primary Dokku directories will restore service to all apps.
 
-See the [persistent storage documentation](/docs/advanced-usage/persistent-storage.md) for more information on how to attach persistent storage to your application.
+See the [persistent storage documentation](/docs/advanced-usage/persistent-storage.md) for more information on how to attach persistent storage to your app.
 
 ## Recovering app code
 

docs/advanced-usage/deployment-tasks.md

@@ -2,11 +2,15 @@
 
 > New as of 0.5.0
 
+## Usage
+
+### Overview
+
 Sometimes you need to run a command on deployment time, but before an app is completely deployed. Common use cases include:
 
-* Checking a database is initialized
-* Running database migrations
-* Any commands required to set up the server (e.g. something like a Django `collectstatic`)
+- Checking a database is initialized
+- Running database migrations
+- Any commands required to set up the server (e.g. something like a Django `collectstatic`)
 
 To support this, Dokku provides support for a special `release` command within your app's `Procfile`, as well as a special `scripts.dokku` key inside of your app's `app.json` file. Be aware that all commands are run within the context of the built docker image - no commands affect the host unless there are volume mounts attached to your app.
 
@@ -22,8 +26,14 @@ Each "phase" has different expectations and limitations:
     - 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
+      - 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
 - `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
@@ -32,18 +42,100 @@ Each "phase" has different expectations and limitations:
         - 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.
+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:
+
+- `["/tini", "--"]`
+- `["/bin/tini", "--"]`
+- `["/usr/bin/tini", "--"]`
+- `["/usr/local/bin/tini", "--"]`
 
 Please keep the above in mind when utilizing deployment tasks.
 
 > To execute commands on the host during a release phase, see the [plugin creation documentation](/docs/development/plugin-creation.md) docs for more information on building your own custom plugin.
 
-## `app.json` deployment tasks
+### Changing the `app.json` location
+
+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.
+
+```shell
+dokku app-json:set node-js-app appjson-path second-app.json
+```
+
+The default value may be set by passing an empty value for the option:
+
+```shell
+dokku app-json:set node-js-app appjson-path
+```
+
+The `appjson-path` property can also be set globally. The global default is `app.json`, and the global value is used when no app-specific value is set.
+
+```shell
+dokku app-json:set --global appjson-path global-app.json
+```
+
+The default value may be set by passing an empty value for the option.
+
+```shell
+dokku app-json:set --global appjson-path
+```
+
+### Displaying app-json reports for an app
+
+> New as of 0.25.0
+
+You can get a report about the app's storage status using the `app-json:report` command:
+
+```shell
+dokku app-json:report
+```
+
+```
+=====> node-js-app app-json information
+       App-json computed appjson path: app2.json
+       App-json global appjson path:   app.json
+       App-json appjson path:          app2.json
+=====> python-sample app-json information
+       App-json computed appjson path: app.json
+       App-json global appjson path:   app.json
+       App-json appjson path:
+=====> ruby-sample app-json information
+       App-json computed appjson path: app.json
+       App-json global appjson path:   app.json
+       App-json appjson path:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku app-json:report node-js-app
+```
+
+```
+=====> node-js-app app-json information
+       App-json computed appjson path: app2.json
+       App-json global appjson path:   app.json
+       App-json appjson path:          app2.json
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku app-json:report node-js-app --app-json-appjson-path
+```
+
+```
+app2.json
+```
+
+### Deployment tasks
+
+#### `app.json` deployment tasks
 
 Dokku provides limited support for the `app.json` manifest from Heroku (documentation available [here](https://devcenter.heroku.com/articles/app-json-schema)). The keys available for use with Deployment Tasks are:
 
 - `scripts.dokku.predeploy`: This is run _after_ an app's docker image is built, but _before_ any containers are scheduled. Changes made to your image are committed at this phase.
-- `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.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`.
 
@@ -57,12 +149,13 @@ The following is an example `app.json` file. Please note that only the `scripts.
     "dokku": {
       "predeploy": "touch /app/predeploy.test",
       "postdeploy": "curl https://some.external.api.service.com/deployment?state=success"
-    }
+    },
+    "postdeploy": "curl https://some.external.api.service.com/created?state=success"
   }
 }
 ```
 
-## Procfile Release command
+#### Procfile Release command
 
 > New as of 0.14.0
 
@@ -74,6 +167,6 @@ To use the `release` command, simply add a `release` stanza to your Procfile.
 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.
+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.

docs/advanced-usage/docker-options.md

@@ -2,7 +2,7 @@
 
 > New as of 0.3.17
 
-Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
+Pass [container options](https://docs.docker.com/engine/reference/run/) to the `docker run` command  during Dokku's `build`, `deploy` and `run` phases
 
 ```
 docker-options:add <app> <phase(s)> OPTION    # Add Docker option to app for phase (comma-separated phase list)
@@ -29,11 +29,13 @@ Manipulation of docker options will not restart running containers. This enables
 
 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.
+
 ## Examples
 
 ### Add Docker options
 
-Add some options for the deployed/running app and when executing [`dokku run`](/docs/deployment/one-off-processes.md):
+Add some options for the deployed/running app and when executing [`dokku run`](/docs/processes/one-off-tasks.md):
 
 ```shell
 # Mount a host volume in a Docker container: "-v /host/path:/container/path"

docs/advanced-usage/persistent-storage.md

@@ -4,12 +4,12 @@
 
 The preferred method to mount external containers to a Dokku managed container, is to use the Dokku storage plugin.
 
-
 ```
-storage:list <app>                             # List bind mounts for app's container(s) (host:container)
-storage:mount <app> <host-dir:container-dir>   # Create a new bind mount
-storage:report [<app>] [<flag>]                # Displays a checks report for one or more apps
-storage:unmount <app> <host-dir:container-dir> # Remove an existing bind mount
+storage:ensure-directory [--chown option] <directory>  # Creates a persistent storage directory in the recommended storage path
+storage:list <app>                                     # List bind mounts for app's container(s) (host:container)
+storage:mount <app> <host-dir:container-dir>           # Create a new bind mount
+storage:report [<app>] [<flag>]                        # Displays a checks report for one or more apps
+storage:unmount <app> <host-dir:container-dir>         # Remove an existing bind mount
 ```
 
 > The storage plugin is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy/run phase.
@@ -19,51 +19,79 @@ The storage plugin supports the following mount points:
 - explicit paths that exist on the host
 - docker volumes
 
-There are a few caveats to using the persistent storage plugin:
-
-- Using implicit paths that do not exist are no longer supported, and actually deprecated in [Docker 1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0). When you specify a persistent storage mount, the host directory is **not** autocreated by either Dokku or Docker.
-- We recommend using the directory `/var/lib/dokku/data/storage` directory as the root host path for mounts, and we create this on Dokku installation.
-- Mounts are only available at run and deploy times, and you **must** redeploy (restart) an app to mount or unmount to an existing app's container.
-- When a directory is mounted, any existing files within the container will be overwritten. If you are writing assets during the build process and then replace the directory with a mount, those files will no longer exist. This is a Docker limitation.
-- Paths are mounted within the container at the root of the disk - `/` - and are **not** relative to `/app` (for buildpacks deploys) or the `WORKDIR` (for Dockerfile/Docker images).
-- For applications using buildpack deploys, the host directory should be owned by the user and group id `32767`. This is due to how permissions within Herokuish - which builds the Docker images - works. For Dockerfile or Docker image deployments, please use the user and group id which corresponds to the one running the process within the container.
-
 ## Usage
 
-This example demonstrates how to mount the recommended directory to `/storage` inside an application called `node-js-app`:
+### Creating storage directories
+
+> New as of 0.25.5
+
+A storage directory can be created with the `storage:ensure-directory` command. This command will create a subdirectory in the recommended `/var/lib/dokku/data/storage` path - created during Dokku installation - and prepare it for use with an app.
 
 ```shell
-# we use a subdirectory inside of the host directory to scope it to just the app
-dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/storage
+dokku storage:ensure-directory lollipop
 ```
 
-Dokku will then mount the shared contents of `/var/lib/dokku/data/storage/node-js-app` to `/storage` inside the container.
+```
+-----> Ensuring /var/lib/dokku/data/storage/lollipop exists
+       Setting directory ownership to 32767:32767
+       Directory ready for mounting
+```
 
-Once you have mounted persistent storage, you will also need to restart the application. See the
-[process scaling documentation](/docs/deployment/process-management.md) for more information.
+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.
+- `--chown heroku`: Use `1000:1000` as the folder permissions.
+  - This is used for apps deployed with Cloud Native Buildpacks using the `heroku/buildpacks` builder.
+- `--chown packeto`: Use `2000:2000` as the folder permissions.
+  - This is used for apps deployed with Cloud Native Buildpacks using the `cloudfoundry/cnb` or `packeto` builders.
+- `--chown false`: Skips the `chown` call.
+
+Users deploying via Dockerfile will want to specify `--chown false` and manually `chown` the created directory if the user and/or group id  of the runnning process in the deployed container do not correspond to any of the above options.
+
+> Warning: Failing to set the correct directory ownership may result in issues in persisting files written to the mounted storage directory.
+
+### Mounting storage into apps
+
+Dokku supports mounting both explicit host paths as well as docker volumes via the `storage:mount` command. This takes two arguments, an app name and a `host-path:container-path` or `docker-volume:container-path` combination.
+
+```shell
+# mount the directory into your container's /app/storage directory, relative to the container root (/)
+# explicit host paths _must_ exist prior to usage.
+dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/app/storage
+
+# mount the docker volume into your container's /app/storage directory, relative to the container root (/)
+# docker volumes _must_ exist prior to usage.
+dokku storage:mount node-js-app some-docker-volume:/app/storage
+```
+
+In the first example, Dokku will then mount the shared contents of `/var/lib/dokku/data/storage/node-js-app` to `/app/storage` inside the container.  The mount point is *not* relative to your app's working directory, and is instead relative to the root (`/`) of the container. Mounts are only available for containers created via `run` and by the deploy process, and not during the build process. In addition, the host path is never auto-created by either Dokku or Docker, and should be an explicit path, not one relative to the current working directory.
+
+> If the `/storage` path within the container had pre-existing content, the container files will be over-written. This may be an issue for users that create assets at build time but then mount a directory at the same place during runtime. Files are not merged.
+
+Once persistent storage is mounted, the app requires a restart. See the [process scaling documentation](/docs/processes/process-management.md) for more information.
 
 ```shell
 dokku ps:restart app-name
 ```
 
-A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container.
+### Unmounting storage
+
+If an app no longer requires a mounted volume or directory, the `storage:unmount` command can be called. This takes the same arguments as the `storage:mount` command, an app name and a `host-path:container-path` or `docker-volume:container-path` combination.
 
 ```shell
-# creating storage for the app 'node-js-app'
-mkdir -p  /var/lib/dokku/data/storage/node-js-app
+# unmount the directory from your container's /app/storage directory, relative to the container root (/)
+dokku storage:unmount node-js-app /var/lib/dokku/data/storage/node-js-app:/app/storage
 
-# ensure the proper user has access to this directory
-chown -R dokku:dokku /var/lib/dokku/data/storage/node-js-app
-
-# as of 0.7.x, you should chown using the `32767` user and group id for buildpack deploys
-# For dockerfile deploys, substitute the user and group id in use within the image
-chown -R 32767:32767 /var/lib/dokku/data/storage/node-js-app
-
-# mount the directory into your container's /app/storage directory, relative to root
-dokku storage:mount app-name /var/lib/dokku/data/storage/node-js-app:/app/storage
+# unmount the docker volume from your container's /app/storage directory, relative to the container root (/)
+dokku storage:unmount node-js-app some-docker-volume:/app/storage
 ```
 
-You can mount one or more directories as desired by following the above pattern.
+Once persistent storage is unmounted, the app requires a restart. See the [process scaling documentation](/docs/processes/process-management.md) for more information.
+
+```shell
+dokku ps:restart app-name
+```
 
 ### Displaying storage reports for an app
 
@@ -111,9 +139,9 @@ dokku storage:report node-js-app --storage-deploy-mounts
 
 ## Use Cases
 
-### Persistent storage
+### Sharing storage across deploys
 
-Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web applications, like user uploads or large binary assets like images, a directory outside the container should be mounted.
+Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web apps, like user uploads or large binary assets like images, a directory outside the container should be mounted.
 
 ### Shared storage between containers
 
@@ -139,12 +167,12 @@ You cannot use mounted volumes during the build phase of a Dockerfile deploy. Th
 
 > Note: **This can cause data loss** if you bind a mount under `/app` in buildpack apps as herokuish will attempt to remove the original app path during the build phase.
 
-## Application User and Persistent Storage file ownership (buildpack apps only)
+## App User and Persistent Storage file ownership (buildpack apps only)
 
 > New as of 0.7.1
 
-By default, Dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
+By default, Dokku will execute your buildpack app processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
 
 > NOTE: this user must exist in your herokuish image.
 
-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

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

docs/advanced-usage/registry-management.md

@@ -0,0 +1,126 @@
+# Registry Management
+
+> New as of 0.25.0
+
+```
+registry:login [--password-stdin] <server> <username> [<password>] # Login to a docker registry
+registry:report [<app>] [<flag>]                                   # Displays a registry report for one or more apps
+registry:set <app> <key> (<value>)                                 # Set or clear a registry property for an app
+```
+
+The registry plugin enables interacting with remote registries, which is useful when either deploying images via `git:from-image` or when interacting with custom schedulers to deploy built image artifacts.
+
+## Usage
+
+### Logging into a registry
+
+The `registry:login` command can be used to log into a docker registry. The following are examples for logging into various common registries:
+
+```shell
+# hub.docker.com
+dokku registry:login docker.io $USERNAME $PASSWORD
+
+# digitalocean
+# the username and password are both defined as the same api token
+dokku registry:login registry.digitalocean.com $DIGITALOCEAN_API_TOKEN $DIGITALOCEAN_API_TOKEN
+
+# github container registry
+# see the following link for information on retrieving a personal access token
+#   https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images#authenticating-to-github-container-registry
+dokku registry:login ghcr.io $USERNAME $REGISTRY_PAT_TOKEN
+
+# quay
+# a robot user may be used to login
+dokku registry:login quay.io $USERNAME $PASSWORD
+```
+
+For security reasons, the password may also be specified as stdin by specifying the `--password-stdin` flag. This is supported regardless of the registry being logged into.
+
+```shell
+echo "$PASSWORD" | dokku registry:login --password-stdin docker.io $USERNAME
+```
+
+For certain Docker registries - such as Amazon ECR or Google's GCR registries - users may instead wish to use a docker credential helper to automatically authenticate against a server; please see the documentation regarding the credential helper in question for further setup instructions.
+
+### Setting a remote server
+
+To specify a remote server registry for pushes, set the `server` property via the `registry:set` command. The default value for this property is empty string. Setting the value to `docker.io` or `hub.docker.com` will result in the computed value being empty string (as that is the default, implicit registry), while any non-zero length value will have a `/` appended to it if there is not one already.
+
+```shell
+dokku registry:set node-js-app server docker.io
+```
+
+This property can be set for a single app or globally via the `--global` flag. When set globally, the app-specific value will always overide the global value. The default global value for this property is empty string.
+
+```shell
+dokku registry:set --global server docker.io
+```
+
+Setting the property value to an empty string will reset the value to the system default. Resetting the value can be done per app or globally.
+
+```shell
+# per-app
+dokku registry:set node-js-app server
+
+# globally
+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.
+- Azure Container Registry:
+  - 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.
+- Digitalocean:
+  - 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.
+- Quay.io:
+  - value: `quay.io/`
+
+### Specifying an image repository name
+
+By default, Dokku uses the value `dokku/$APP_NAME` as the image repository that is pushed and deployed. For certain registries, the `dokku` namespace may not be available to your user. In these cases, the value can be set by changing the value of the `image-repo` property via the `registry:set` command.
+
+```shell
+dokku registry:set node-js-app image-repo my-awesome-prefix/node-js-app
+```
+
+Setting the property value to an empty string will reset the value to the system default. Resetting the value has to be done per-app.
+
+```shell
+# per-app
+dokku registry:set node-js-app push-on-release
+```
+
+### Pushing images on build
+
+To push the image on release, set the `push-on-release` property to `true` via the `registry:set` command. The default value for this property is `false`. Setting the property to `true` will result in the image being tagged with an ID that is incremented with every release. This tag will be what is used for running app code.
+
+```shell
+dokku registry:set node-js-app push-on-release true
+```
+
+This property can be set for a single app or globally via the `--global` flag. When set globally, the app-specific value will always overide the global value. The default global value for this property is `false`.
+
+```shell
+dokku registry:set --global push-on-release true
+```
+
+Setting the property value to an empty string will reset the value to the system default. Resetting the value can be done per app or globally.
+
+```shell
+# per-app
+dokku registry:set node-js-app push-on-release
+
+# globally
+dokku registry:set --global push-on-release
+```

docs/advanced-usage/resource-management.md

@@ -28,7 +28,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.
 
@@ -103,7 +103,6 @@ dokku resource:limit node-js-app
 
 This may also be combined with the `--process-type` flag to see app limits on a process-type level. Note that the displayed values are not merged with the defaults.
 
-
 ```shell
 dokku resource:limit --process-type web node-js-app
 ```

docs/advanced-usage/schedulers/alternate-schedulers.md

@@ -1,10 +0,0 @@
-# Alternative Schedulers
-
-In addition to the built-in [docker-local scheduler](/docs/advanced-usage/schedulers/docker-local.md), Dokku also supports two scheduler plugins:
-
-- [Kubernetes](https://github.com/dokku/dokku-scheduler-kubernetes)
-- [Nomad](https://github.com/dokku/dokku-scheduler-nomad)
-
-These scheduler implementations may not be complete, though provide enough functionality for a user to get an app deployed via the underlying scheduler.
-
-For users that require additional functionality, please refer to the [Sponsoring Documentation](https://github.com/dokku/.github/blob/master/SPONSORING.md).

docs/advanced-usage/schedulers/docker-local.md

@@ -1,83 +0,0 @@
-# Docker Local Scheduler
-
-> Subcommands new as of 0.12.12
-
-```
-scheduler-docker-local:report [<app>] [<flag>]              # Displays a scheduler-docker-local report for one or more apps
-scheduler-docker-local:set <app> <key> (<value>)            # Set or clear a scheduler-docker-local property for an app
-```
-
-> New as of 0.12.0
-
-Dokku natively includes functionality to manage application lifecycles for a single server using the `scheduler-docker-local` plugin. It is the default scheduler, but as with all schedulers, it is set on a per-application basis. The scheduler can currently be overridden by running the following command:
-
-```shell
-dokku config:set node-js-app DOCKER_SCHEDULER=docker-local
-```
-
-As it is the default, unsetting the `DOCKER_SCHEDULER` config variable is also a valid way to reset the scheduler.
-
-```shell
-dokku config:unset node-js-app DOCKER_SCHEDULER
-```
-
-## Usage
-
-### Disabling chown of persistent storage
-
-The `scheduler-docker-local` plugin will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. You may disable this by running the following `scheduler-docker-local:set` command for your application:
-
-```shell
-dokku scheduler-docker-local:set node-js-app disable-chown true
-```
-
-Once set, you may re-enable it by setting a blank value for `disable-chown`:
-
-```shell
-dokku scheduler-docker-local:set node-js-app disable-chown
-```
-
-## Implemented Triggers
-
-This plugin implements various functionality through `plugn` triggers to integrate with Docker for running apps on a single server. The following functionality is supported by the `scheduler-docker-local` plugin.
-
-- `check-deploy`
-- `core-post-deploy`
-- `post-app-clone-setup`
-- `post-app-rename-setup`
-- `post-create`
-- `post-delete`
-- `pre-deploy`
-- `pre-restore`
-- `scheduler-app-status`
-- `scheduler-deploy`
-- `scheduler-docker-cleanup`
-- `scheduler-inspect`
-- `scheduler-is-deployed`
-- `scheduler-logs`
-- `scheduler-logs-failed`
-- `scheduler-retire`
-- `scheduler-run`
-- `scheduler-stop`
-- `scheduler-tags-create`
-- `scheduler-tags-destroy`
-
-## Supported Resource Management Properties
-
-The `docker-local` scheduler supports a minimal list of resource _limits_ and _reservations_. The following properties are supported:
-
-### Resource Limits
-
-- cpu: (docker option: `--cpus`), is specified in number of CPUs a process can access.
-  - See the ["CPU" section](https://docs.docker.com/config/containers/resource_constraints/#cpu) of the Docker Runtime Options documentation for more information.
-- memory: (docker option: `--memory`) should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes).
-  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.
-- memory-swap: (docker option: `--memory-swap`) should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
-  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.
-- nvidia-gpus: (docker option: `--gpus`), is specified in number of Nvidia GPUs a process can access.
-  - See the ["GPU" section](https://docs.docker.com/config/containers/resource_constraints/#gpu) of the Docker Runtime Options documentation for more information.
-
-### Resource Reservations
-
-- memory: (docker option: `--memory-reservation`) should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
-  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.

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/#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/#customizing-the-nginx-configuration) docs for more details.

docs/appendices/0.20.0-migration-guide.md

@@ -50,7 +50,7 @@ Dokku will no longer distribute packages for Debian versions that are not `stabl
 - Debian 7 (wheezy)
 - Debian 8 (jessie)
 
-### App report flags
+### Removed App report flags
 
 The `--git-sha` flag was moved from the `apps:report` command to the `git:report` command.
 

docs/appendices/0.24.0-migration-guide.md

@@ -0,0 +1,12 @@
+# 0.24.0 Migration Guide
+
+## Changes
+
+- The commands `proxy:enable`, `proxy:disable` and `proxy:build-config` now support the `--all` flag in addition to general parallelism.
+- The `builder-cnb` plugin has been renamed `builder-pack`, and all related plugin triggers have had the suffix `-cnb` changed to `-pack`.
+
+## Deprecations
+
+- The 1.0.0 release of Dokku will no longer select buildpack builders over dockerfile builders if both builders match. Instead, Dokku will choose the first builder that responds to the `builder-detect` trigger. Users that wish to use a specific builder may set a builder using the `builder:set` command, which will force Dokku to use the specified builder regardless of what might be auto-detected.
+- The `tags` plugin is deprecated in favor of the [`git:from-image`](/docs/deployment/methods/git.md#initializing-an-app-repository-from-a-docker-image) command. It will be removed in the next minor release, and is considered unmaintained. Users are highly encouraged to switch their workflows to `git:from-image`.
+- The `tar` plugin is deprecated in favor of the [`git:from-archive`](/docs/deployment/methods/git.md#initializing-an-app-repository-from-an-archive-file) command. It will be removed in the next minor release, and is considered unmaintained. Users are highly encouraged to switch their workflows to `git:from-archive`.

docs/appendices/0.25.0-migration-guide.md

@@ -0,0 +1,37 @@
+# 0.25.0 Migration Guide
+
+## Registry Plugin
+
+The [dokku-registry](https://github.com/dokku/dokku-registry) plugin is now built-in. This comes with a few changes:
+
+- 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/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
+
+### Changes
+
+- The network plugin can now set an `initial-network` for all containers on creation. This is a replacement for specifying the `--network` flag via the `docker-options` plugin. Please see the [network documentation](/docs/networking/network.md#attaching-an-app-to-a-network) for more information.
+- 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.
+- 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
+
+- In previous versions of Dokku, the only way to specify a custom `Dockerfile` was to use the `docker-options` plugin to set the `--file` flag for a docker build. As of 0.25.0, the `builder-dockerfile:set` command should be used instead, as outlined in the [docs here](/docs/deployment/builders/dockerfiles.md#changingthe-dockerfile-location). Usage of the old method should be migrated to the new method.
+- The `--rm` and `--rm-container` flags may be specified but no longer have any effect on `dokku run`.
+- The `--detach` flag is deprecated in favor of the `run:detached` command.
+- The `DOKKU_SCALE` file is deprecated. Please see the [process management documentation](/docs/processes/process-management.md#manually-managing-process-scaling) for more information on it's replacement with the `formation` key of the `app.json` file.
+- The hooks `post-release-buildpack`, `post-release-dockerfile`, and `post-release-pack` are deprecated in favor of `post-release-builder`. See the [plugin triggers documentation](https://dokku.com/docs/development/plugin-triggers/#post-release-builder) for more details.
+
+## Removals
+
+- As of April 2021, Ubuntu 16.04 is no longer an LTS release, and support has been removed. Packages may still install on older versions of Ubuntu, but are no longer tested, and therefore no support will be provided.
+- The web installer has been removed. Users are now required to setup Dokku via cli commands. This change was made to combat potential security issues where users ignored the web installer, allowing unauthorized users to add their keys to the host.
+- The `scheduler-docker-cleanup` plugin trigger has been removed from the scheduler interface, and is no longer invoked.

docs/appendices/0.26.0-migration-guide.md

@@ -0,0 +1,12 @@
+# 0.26.0 Migration Guide
+
+## Removals
+
+- The `tags` plugin - deprecated in [0.24.0](/docs/appendices/0.24.0-migration-guide.md) - was removed. Users are highly encouraged to switch their workflows to `git:from-image`.
+- The `tar` plugin - deprecated in [0.24.0](/docs/appendices/0.24.0-migration-guide.md) - was removed. Users are highly encouraged to switch their workflows to `git:from-archive`.
+
+## Changes
+
+- 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.

docs/appendices/0.27.0-migration-guide.md

@@ -0,0 +1,13 @@
+# 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 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` or `traefik`.

docs/appendices/0.5.0-migration-guide.md

@@ -5,11 +5,11 @@
 - 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)
+  - 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)
+  - 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`
 - All domains for an SSL-enabled app will be redirected to https by default
@@ -20,6 +20,6 @@
 
 ## Dockerfile apps with exposed ports
 
-- Dockerfiles with `EXPOSE` clauses will get [all **tcp** ports proxied by default](/docs/deployment/methods/dockerfiles.md#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/advanced-usage/proxy-management.md) with `dokku proxy:disable node-js-app`
+  - 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

@@ -12,21 +12,21 @@
 ## Proxy port mapping
 
 - You can now configure host -> container proxy port mappings
-  - The UI is handled by the [proxy](/docs/advanced-usage/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/advanced-usage/proxy-management.md) or by directly setting `DOKKU_PROXY_PORT_MAP` with the `config:set` command
+    - 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.7.0-migration-guide.md

@@ -6,7 +6,7 @@ We should now properly handle file ownership for mounted directories. This was e
 
 ## Restart Policies
 
-If you previously managed container restart policies via docker-options, these can now be managed natively via the built-in `ps` plugin. There is no migration necessary. See the [restart policy documentation](/docs/deployment/process-management.md#restart-policies) for more details.
+If you previously managed container restart policies via docker-options, these can now be managed natively via the built-in `ps` plugin. There is no migration necessary. See the [restart policy documentation](/docs/processes/process-management.md#restart-policies) for more details.
 
 ## SSH Keys
 

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.23.3/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.23.3/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.23.3/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.23.3/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.28.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.28.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.28.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.28.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.23.3\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.23.3\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.23.3\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.23.3\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.23.3\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.23.3\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.28.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image\/png",
             "density": "4.0"

docs/assets/versions.json

@@ -20,6 +20,11 @@
     "0.20.4",
     "0.21.4",
     "0.22.9",
-    "0.23.3"
+    "0.23.9",
+    "0.24.10",
+    "0.25.7",
+    "0.26.8",
+    "0.27.10",
+    "0.28.2"
   ]
 }

docs/community/clients.md

@@ -18,16 +18,6 @@ npm install -g dokku-toolbelt
 
 See [documentation here](https://www.npmjs.com/package/dokku-toolbelt) for more information.
 
-## (python) dokku-client
-
-dokku-client is an extensible python-based cli wrapper for remote Dokku hosts. You can install it via the following shell command (assuming you have python and pip installed):
-
-```shell
-pip install dokku-client
-```
-
-See [documentation here](https://github.com/adamcharnock/dokku-client) for more information.
-
 ## (ruby) Dokku CLI
 
 Dokku CLI is a rubygem that acts as a client for your Dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):

docs/community/plugins.md

@@ -47,112 +47,26 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 
 > Warning: The following plugins have been supplied by our community and may not have been tested by Dokku maintainers.
 
-[256dpi]: https://github.com/256dpi
-[abossard]: https://github.com/dudagroup
-[ademuk]: https://github.com/ademuk
-[agco-adm]: https://github.com/agco-adm
-[alessio]: https://github.com/alessio
-[alex-sherwin]: https://github.com/alex-sherwin
-[alexanderbeletsky]: https://github.com/alexanderbeletsky
-[alexkruegger]: https://github.com/alexkruegger
-[Aluxian]: https://github.com/Aluxian
-[Aomitayo]: https://github.com/Aomitayo
-[apmorton]: https://github.com/apmorton
-[artofrawr]: https://github.com/artofrawr
-[badsyntax]: https://github.com/badsyntax
-[basgys]: https://github.com/basgys
-[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
-[blag]: https://github.com/blag
-[cameron-martin]: https://github.com/cameron-martin
-[candlewaster]: https://notabug.org/candlewaster
-[cedricziel]: https://github.com/cedricziel
-[cef]: https://github.com/cef
-[cjblomqvist]: https://github.com/cjblomqvist
-[crisward]: https://github.com/crisward
-[cu12]: https://github.com/cu12
-[darkpixel]: https://github.com/darkpixel
-[dokku]: https://github.com/dokku
-[dokku-community]: https://github.com/dokku-community
-[dyson]: https://github.com/dyson
-[fermuch]: https://github.com/fermuch
-[fgrehm]: https://github.com/fgrehm
-[Flink]: https://github.com/Flink
-[fomojola]: https://github.com/fomojola
-[gdi2290]: https://github.com/gdi2290
-[hughfletcher]: https://github.com/hughfletcher
-[iamale]: https://github.com/iamale
-[ignlg]: https://github.com/ignlg
-[iloveitaly]: https://github.com/iloveitaly
-[investtools]: https://github.com/investtools
-[iskandar]: https://github.com/iskandar
-[jagandecapri]: https://github.com/jagandecapri
-[jeffutter]: https://github.com/jeffutter
-[jlachowski]: https://github.com/jlachowski
-[josegonzalez]: https://github.com/josegonzalez
-[Kloadut]: https://github.com/Kloadut
-[krisrang]: https://github.com/krisrang
-[luxifer]: https://github.com/luxifer
-[m0rth1um]: https://github.com/m0rth1um
-[Maciej Łebkowski]: https://github.com/mlebkowski
-[matto1990]: https://github.com/matto1990
-[mbreit]: https://github.com/mbreit
-[mbriskar]: https://github.com/mbriskar
-[michaelshobbs]: https://github.com/michaelshobbs
-[mikecsh]: https://github.com/mikecsh
-[mikexstudios]: https://github.com/mikexstudios
-[mimischi]: https://github.com/mimischi
-[mixxorz]: https://github.com/mixxorz
-[mlebkowski]: https://github.com/mlebkowski
-[motin]: https://github.com/motin
-[mrname]: https://github.com/mrname
-[musicglue]: https://github.com/musicglue
-[neam]: https://github.com/neam
-[nickcharlton]: https://github.com/nickcharlton
-[nickstenning]: https://github.com/nickstenning
-[nornagon]: https://github.com/nornagon
-[ohardy]: https://github.com/ohardy
-[pauldub]: https://github.com/pauldub
-[pnegahdar]: https://github.com/pnegahdar
-[RaceHub]: https://github.com/racehub
-[ribot]: https://github.com/ribot
-[rlaneve]: https://github.com/rlaneve
-[robv]: https://github.com/robv
-[scottatron]: https://github.com/scottatron
-[sehrope]: https://github.com/sehrope
-[sekjun9878]: https://github.com/sekjun9878
-[sgulseth]: https://github.com/sgulseth
-[sseemayer]: https://github.com/sseemayer
-[statianzo]: https://github.com/statianzo
-[stuartpb]: https://github.com/stuartpb
-[thrashr888]: https://github.com/thrashr888
-[wmluke]: https://github.com/wmluke
-[Zenedith]: https://github.com/Zenedith
-[fteychene]: https://github.com/fteychene
-[sarendsen]: https://github.com/sarendsen
-[baikunz]: https://github.com/baikunz
-[lazyatom]: https://github.com/lazyatom
-[ollej]: https://github.com/ollej
-
 ### Datastores
 
 #### Relational
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                 |
+| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [kloadut][]           | 0.3.x                 |
 | [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                 |
 | [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+               |
 | [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]        | 0.3.x                 |
 | [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                 |
-| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+               |
+| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [flink][]             | 0.3.26+               |
 
 #### Caching
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Nginx Cache](https://github.com/Aluxian/dokku-nginx-cache)                                       | [Aluxian][]           | 0.5.0+                |
+| [Nginx Cache](https://github.com/Aluxian/dokku-nginx-cache)                                       | [aluxian][]           | 0.5.0+                |
 | [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                 |
-| [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [Zenedith][]          | Varnish cache between nginx and application with base configuration|
+| [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [zenedith][]          | Varnish cache between nginx and application with base configuration|
 
 #### Queuing
 
@@ -173,10 +87,6 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                 |
 | [Headless Chrome](https://github.com/lazyatom/dokku-chrome)                                       | [lazyatom][]          | 0.8.1+                |
 
-[dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
-[c77cbf1]: https://github.com/dokku/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
-[28de3ec]: https://github.com/dokku/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40
-
 ### Plugins Implementing New Dokku Functionality
 
 | Plugin                                                                                            | Author                | Compatibility         |
@@ -185,13 +95,14 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [Docker Direct](https://github.com/josegonzalez/dokku-docker-direct)                              | [josegonzalez][]      | 0.4.0+                |
 | [Dokku Clone](https://github.com/crisward/dokku-clone)                                            | [crisward][]          | 0.4.0+                |
 | [Dokku Copy App Config Files](https://github.com/josegonzalez/dokku-supply-config)                | [josegonzalez][]      | 0.4.0+                |
-| [Dockerfile custom path](https://github.com/mimischi/dokku-dockerfile)                            | [mimischi][]          | 0.8.0+                               |
+| [Dockerfile custom path](https://github.com/mimischi/dokku-dockerfile)                            | [mimischi][]          | 0.8.0+                |
 | [Dokku Require](https://github.com/crisward/dokku-require)<sup>1</sup>                            | [crisward][]          | 0.4.0+                |
 | [Global Certificates](https://github.com/josegonzalez/dokku-global-cert)                          | [josegonzalez][]      | 0.5.0+                |
-| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.4.0+                |
+| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [benjamin-dobell][]   | 0.4.0+                |
 | [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
 | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
+| [Litestream](https://github.com/AxelTheGerman/dokku-litestream)<sup>2</sup>                       | [AxelTheGerman][]     | 0.27.0+               |
 | [Monit (Health Checks)](https://github.com/mbreit/dokku-monit)                                    | [mbreit][]            | 0.8.0+                |
 | [Nuke Containers](https://github.com/josegonzalez/dokku-nuke)                                     | [josegonzalez][]      | 0.4.0+                |
 | [Open App Ports](https://github.com/josegonzalez/dokku-ports)                                     | [josegonzalez][]      | 0.3.x                 |
@@ -199,28 +110,28 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [robots.txt](https://notabug.org/candlewaster/dokku-robots.txt)                                   | [candlewaster][]      | 0.4.x                 |
 | [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>2</sup>            | [cedricziel][]        | 0.4.0+                |
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>3</sup>                   | [cedricziel][]        | 0.3.x                 |
-| [Application build hook](https://github.com/fteychene/dokku-build-hook)                           | [fteychene][]         | 0.4.0+                 |
-| [Post Deploy Script](https://github.com/baikunz/dokku-post-deploy-script)                         | [baikunz][]           | 0.4.0+                 |
+| [Application build hook](https://github.com/fteychene/dokku-build-hook)                           | [fteychene][]         | 0.4.0+                |
+| [Post Deploy Script](https://github.com/baikunz/dokku-post-deploy-script)                         | [baikunz][]           | 0.4.0+                |
 | [Auto Sync](https://github.com/IdeaSynthesis/dokku-autosync)<sup>4</sup>                          | [fomojola][]          | 0.8.1+                |
 | [Deploy Webhook](https://github.com/IdeaSynthesis/dokku-deploy-webhook)<sup>5</sup>               | [fomojola][]          | 0.8.1+                |
 
-[217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
-
 <sup>1</sup> Extends app.json support to include creating volumes and creating / linking databases on push
 
-<sup>2</sup> Adds the possibility to add SSH deployment keys to receive private hosted packages
+<sup>2</sup> Adds SQLite replication to external object storage via [Litestream](https://litestream.io)
 
-<sup>3</sup> Adds the ability to add custom hosts to the containers known_hosts file to be able to ssh them easily (useful with deployment keys)
+<sup>3</sup> Adds the possibility to add SSH deployment keys to receive private hosted packages
 
-<sup>4</sup> Adds the ability to sync an application repo with a remote Github repo (useful for automated rebuilds without needing a git push from an external system
+<sup>4</sup> Adds the ability to add custom hosts to the containers known_hosts file to be able to ssh them easily (useful with deployment keys)
 
-<sup>5</sup> Adds the ability to invoke a post-deploy webhook with the IP, port and app name, all with a single config:set).
+<sup>5</sup> Adds the ability to sync an application repo with a remote GitHub repo (useful for automated rebuilds without needing a git push from an external system
+
+<sup>6</sup> Adds the ability to invoke a post-deploy webhook with the IP, port and app name, all with a single config:set).
 
 ### Other Plugins
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             | 0.4.0+                |
+| [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [flink][]             | 0.4.0+                |
 | [APT](https://github.com/dokku-community/dokku-apt)                                               | [dokku-community][]   | 0.18.x+               |
 | [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] | 0.3.x                 |
 | [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        | 0.3.x                 |
@@ -228,7 +139,7 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      | 0.3.x                 |
 | [Builders: bower, compass, gulp, grunt](https://github.com/ignlg/dokku-builders-plugin)           | [ignlg][]             | 0.4.0+                |
 | [Chef cookbook](https://github.com/nickcharlton/dokku-cookbook)                                   | [nickcharlton][]      |                       |
-| [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                 | [Flink][]             | 0.4.0+                |
+| [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                 | [flink][]             | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
 | [Limit (Resource management)](https://github.com/sarendsen/dokku-limit)                           | [sarendsen][]         | 0.9.0+                |
 | [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.4.0+                |
@@ -243,16 +154,15 @@ The following plugins are available and provided by Dokku maintainers.  Please f
 | [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             | 0.4.0+                |
 | [Telegram Notifications](https://github.com/m0rth1um/dokku-telegram)                              | [m0rth1um][]          | 0.4.0+                |
 | [Tor](https://github.com/michaelshobbs/dokku-tor)                                                 | [michaelshobbs][]     | 0.4.0+                |
-| [User ACL](https://github.com/dokku-community/dokku-acl)                                          | [Maciej Łebkowski][]  | 0.4.0+                |
+| [User ACL](https://github.com/dokku-community/dokku-acl)                                          | [maciej łebkowski][]  | 0.4.0+                |
 | [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      | 0.3.x                 |
 | [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          | 0.4.0+                |
-| [Dokku Wordpress](https://github.com/dokku-community/dokku-wordpress)                             | [dokku-community][]      | 0.4.0+                |
-| [Access](https://github.com/mainto/dokku-access)                                                  | [mainto](https://github.com/mainto)            | 0.4.0+                |
-| [Dokku Nginx Trust Proxy](https://github.com/kingsquare/dokku-nginx-vhost-trustproxy)             | [kingsquare](https://github.com/kingsquare)  | 0.4.0+ |
-| [Fonts](https://github.com/ollej/dokku-fonts)             | [ollej]  | 0.19.11+ |
+| [Dokku Wordpress](https://github.com/dokku-community/dokku-wordpress)                             | [dokku-community][]   | 0.4.0+                |
+| [Access](https://github.com/mainto/dokku-access)                                                  | [mainto][]            | 0.4.0+                |
+| [Dokku Nginx Trust Proxy](https://github.com/kingsquare/dokku-nginx-vhost-trustproxy)             | [kingsquare][]  | 0.4.0+ |
+| [Fonts](https://github.com/ollej/dokku-fonts)                                                     | [ollej][]             | 0.19.11+ |
 | [Discourse](https://github.com/badsyntax/dokku-discourse)                                         | [badsyntax][]         | 0.21.4+               |
 
-
 ### Deprecated Plugins
 
 The following plugins have been removed as their functionality is now in Dokku Core.
@@ -260,7 +170,7 @@ The following plugins have been removed as their functionality is now in Dokku C
 | Plugin                                                                                            | Author                | In Dokku Since                            |
 | ------------------------------------------------------------------------------------------------- | --------------------- | ----------------------------------------- |
 | [App User](https://github.com/michaelshobbs/dokku-app-user)                                       | [michaelshobbs][]     | v0.7.1 (herokuish 0.3.18)                 |
-| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)                  |
+| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [neam][]             | v0.3.10 (domains plugin)                  |
 | [Debug](https://github.com/josegonzalez/dokku-debug)                                              | [josegonzalez][]      | v0.3.9 (trace command)                    |
 | [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin)           |
 | [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | v0.4.2 (named containers plugin)          |
@@ -271,31 +181,27 @@ The following plugins have been removed as their functionality is now in Dokku C
 | [List Containers](https://github.com/josegonzalez/dokku-list)                                     | [josegonzalez][]      | v0.3.14 (ps plugin)                       |
 | [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           | v0.4.0 (herokuish)                        |
 | [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)                  |
-| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin)          |
+| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [flink][]             | v0.4.2 (named-containers plugin)          |
 | [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)                  |
 | [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin)           |
 | [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | v0.5.0 (deployment tasks)                 |
 | [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)            |
 | [Process Manager: Circus](https://github.com/apmorton/dokku-circus)                               | [apmorton][]          | v0.3.14/0.7.0 (ps/restart policy plugin)  |
-| [Process Manager: Forego](https://github.com/Flink/dokku-forego)                                  | [Flink][]             | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Forego](https://github.com/Flink/dokku-forego)                                  | [flink][]             | v0.3.14/0.7.0 (ps plugin)                 |
 | [Process Manager: Forego](https://github.com/iskandar/dokku-forego)                               | [iskandar][]          | v0.3.14/0.7.0 (ps plugin)                 |
 | [Process Manager: Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)      | [sehrope][]           | v0.3.14/0.7.0 (ps plugin)                 |
-| [Process Manager: Shoreman ](https://github.com/statianzo/dokku-shoreman)                         | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Shoreman](https://github.com/statianzo/dokku-shoreman)                          | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
 | [Process Manager: Supervisord](https://github.com/statianzo/dokku-supervisord)                    | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
 | [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)                       |
 | [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | Docker 1.8+                               |
 | [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)                 |
 | [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)                 |
 | [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)                 |
-| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)                  |
 | [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | v0.5.0 (storage plugin)                   |
 
 <sup>1</sup> Conflicts with [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)
 <sup>2</sup> Similar to the heroku-labs feature (see https://devcenter.heroku.com/articles/labs-user-env-compile)
 
-[a043e98]: https://github.com/stuartpb/dokku-bind-port/commit/a043e9892f4815b6525c850131e09fd64db5c1fa
-
-
 ### Unmaintained Plugins
 
 The following plugins are no longer maintained by their developers.
@@ -304,22 +210,106 @@ The following plugins are no longer maintained by their developers.
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
 | [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
-| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+                |
-| [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
+| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [flink][]             | 0.4.0+                |
+| [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [raceHub][]           | Compatible with 0.2.0 |
 | [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
 | [Dokku Registry](https://github.com/agco-adm/dokku-registry)                                      | [agco-adm][]          | 0.4.0+
 | [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              | Not compatible with >= 0.3.0 (still uses /home/git) |
 | [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
 | [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        | < 0.4.0               |
 | [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
-| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+                |
+| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [flink][]             | 0.4.0+                |
 | [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
 | [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
-| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |
+| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [aomitayo][]          |                       |
 | [PostGIS](https://github.com/fermuch/dokku-pg-plugin)                                             | [fermuch][]           |                       |
 | [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
-| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
+| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 |
 | [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |
 | [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | 0.3.26+               |
 
 <sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
+
+[256dpi]: https://github.com/256dpi
+[ademuk]: https://github.com/ademuk
+[agco-adm]: https://github.com/agco-adm
+[alessio]: https://github.com/alessio
+[alex-sherwin]: https://github.com/alex-sherwin
+[alexanderbeletsky]: https://github.com/alexanderbeletsky
+[alexkruegger]: https://github.com/alexkruegger
+[aluxian]: https://github.com/aluxian
+[aomitayo]: https://github.com/aomitayo
+[apmorton]: https://github.com/apmorton
+[artofrawr]: https://github.com/artofrawr
+[AxelTheGerman]: https://github.com/AxelTheGerman
+[badsyntax]: https://github.com/badsyntax
+[basgys]: https://github.com/basgys
+[benjamin-dobell]: https://github.com/benjamin-dobell
+[blag]: https://github.com/blag
+[cameron-martin]: https://github.com/cameron-martin
+[candlewaster]: https://notabug.org/candlewaster
+[cedricziel]: https://github.com/cedricziel
+[cef]: https://github.com/cef
+[cjblomqvist]: https://github.com/cjblomqvist
+[crisward]: https://github.com/crisward
+[cu12]: https://github.com/cu12
+[darkpixel]: https://github.com/darkpixel
+[dokku]: https://github.com/dokku
+[dokku-community]: https://github.com/dokku-community
+[dyson]: https://github.com/dyson
+[fermuch]: https://github.com/fermuch
+[fgrehm]: https://github.com/fgrehm
+[flink]: https://github.com/flink
+[fomojola]: https://github.com/fomojola
+[gdi2290]: https://github.com/gdi2290
+[hughfletcher]: https://github.com/hughfletcher
+[iamale]: https://github.com/iamale
+[ignlg]: https://github.com/ignlg
+[iloveitaly]: https://github.com/iloveitaly
+[investtools]: https://github.com/investtools
+[iskandar]: https://github.com/iskandar
+[jagandecapri]: https://github.com/jagandecapri
+[jeffutter]: https://github.com/jeffutter
+[jlachowski]: https://github.com/jlachowski
+[josegonzalez]: https://github.com/josegonzalez
+[kingsquare]: https://github.com/kingsquare
+[kloadut]: https://github.com/kloadut
+[krisrang]: https://github.com/krisrang
+[luxifer]: https://github.com/luxifer
+[m0rth1um]: https://github.com/m0rth1um
+[maciej łebkowski]: https://github.com/mlebkowski
+[mainto]: https://github.com/mainto
+[matto1990]: https://github.com/matto1990
+[mbreit]: https://github.com/mbreit
+[mbriskar]: https://github.com/mbriskar
+[michaelshobbs]: https://github.com/michaelshobbs
+[mikecsh]: https://github.com/mikecsh
+[mikexstudios]: https://github.com/mikexstudios
+[mimischi]: https://github.com/mimischi
+[mixxorz]: https://github.com/mixxorz
+[motin]: https://github.com/motin
+[mrname]: https://github.com/mrname
+[musicglue]: https://github.com/musicglue
+[neam]: https://github.com/neam
+[nickcharlton]: https://github.com/nickcharlton
+[nickstenning]: https://github.com/nickstenning
+[ohardy]: https://github.com/ohardy
+[pauldub]: https://github.com/pauldub
+[pnegahdar]: https://github.com/pnegahdar
+[racehub]: https://github.com/racehub
+[ribot]: https://github.com/ribot
+[rlaneve]: https://github.com/rlaneve
+[robv]: https://github.com/robv
+[scottatron]: https://github.com/scottatron
+[sehrope]: https://github.com/sehrope
+[sekjun9878]: https://github.com/sekjun9878
+[statianzo]: https://github.com/statianzo
+[stuartpb]: https://github.com/stuartpb
+[thrashr888]: https://github.com/thrashr888
+[wmluke]: https://github.com/wmluke
+[zenedith]: https://github.com/zenedith
+[fteychene]: https://github.com/fteychene
+[sarendsen]: https://github.com/sarendsen
+[baikunz]: https://github.com/baikunz
+[lazyatom]: https://github.com/lazyatom
+[ollej]: https://github.com/ollej

docs/configuration/domains.md

@@ -32,7 +32,6 @@ If an FQDN such as `dokku.org` is used as the application name, the global virtu
 
 You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed. See the [plugin trigger documentation](/docs/development/plugin-triggers.md#nginx-hostname) for more information.
 
-
 ## Disabling VHOSTS
 
 If desired, it is possible to disable vhosts with the domains plugin.
@@ -43,7 +42,6 @@ dokku domains:disable node-js-app
 
 On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_PROXY_PORT` and/or `DOKKU_PROXY_SSL_PORT` (for services configured to use SSL.)
 
-
 The domains plugin allows you to specify custom domains for applications. This plugin is aware of any ssl certificates that are imported via `certs:add`. Be aware that disabling domains (with `domains:disable`) will override any custom domains.
 
 ```shell
@@ -115,4 +113,4 @@ dokku domains:report node-js-app --domains-app-enabled
 
 ## Default site
 
-This is specific to your proxy plugin of choice. See the [nginx documentation](/docs/configuration/nginx.md#default-site) for more information on how to configure this for the default nginx proxy implementation.
+This is specific to your proxy plugin of choice. See the [nginx documentation](/docs/networking/proxies/nginx.md#default-site) for more information on how to configure this for the default nginx proxy implementation.

docs/configuration/environment-variables.md

@@ -5,7 +5,7 @@ Typically an application will require some configuration to run properly. Dokku
 The `config` plugin provides the following commands to manage your variables:
 
 ```
-config (<app>|--global)                                                               Pretty-print an app or global environment
+config:show (<app>|--global)                                                          Pretty-print an app or global environment
 config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
 config:clear (<app>|--global)                                                         Clears environment variables
 config:export (<app>|--global) [--envfile]                                            Export a global or app environment
@@ -14,11 +14,11 @@ config:keys (<app>|--global) [--merged]
 config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
 config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...]                          Unset one or more config vars
 ```
-> For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
+> For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available _only_ during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860). Consider using [build arguments](/docs/deployment/builders/dockerfiles.md#build-time-configuration-variables) to expose variables during build-time for Dockerfile apps.
 
 Environment variables are available both at run time and during the application build/compilation step for buildpack-based deploys.
 
-For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
+For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is _not_ updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
 
 > Note: Global `ENV` files are sourced before app-specific `ENV` files. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.
 
@@ -91,11 +91,11 @@ The following config variables have special meanings and can be set in a variety
 | `DOKKU_EVENTS_LOGFILE`         | `$DOKKU_LOGS_DIR/events.log`    | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | Where the events log file is written to. |
 | `DOKKU_APP_NAME`               | none                            | `--app APP` flag                                                                                                                                 | Name of application to work on. Respected by core plugins. |
 | `DOKKU_APPS_FORCE_DELETE`      | none                            | `--force` flag                                                                                                                                   | Whether to force delete an application. Also used by other plugins for destructive actions. |
-| `DOKKU_CHECKS_URL`             | `http://dokku.viewdocs.io/dokku/deployment/zero-downtime-deploys/` | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                        | Url displayed during deployment when no CHECKS file exists. |
-| `DOKKU_DETACH_CONTAINER`       | none                            | `--detach` flag                                                                                                                                  | Whether to detach a container started via `dokku run`. |
+| `DOKKU_CHECKS_URL`             | `https://dokku.com/docs/deployment/zero-downtime-deploys/` | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                | Url displayed during deployment when no CHECKS file exists. |
+| `DOKKU_DETACH_CONTAINER`       | none                            | `--detach` flag                                                                                                                                  | Deprecated: Whether to detach a container started via `dokku run`. |
 | `DOKKU_QUIET_OUTPUT`           | none                            | `--quiet` flag                                                                                                                                   | Silences certain header output for `dokku` commands. |
-| `DOKKU_RM_CONTAINER`           | none                            | `dokku config:set` <br /> `--rm-container` flag <br /> `--rm` flag                                                                               | Whether to keep `dokku run` containers around or not. |
-| `DOKKU_TRACE`                  | none                            | `dokku trace:on`   <br /> `dokku trace:off` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
+| `DOKKU_RM_CONTAINER`           | none                            | `dokku config:set` <br />                                                                                                                        | Deprecated: Whether to keep `dokku run` containers around or not. |
+| `DOKKU_TRACE`                  | none                            | `dokku trace:on`   <br /> `dokku trace:off` <br /> `--trace` flag                                                                                | Turn on very verbose debugging. |
 | `DOKKU_APP_PROXY_TYPE`         | `nginx`                         | `dokku proxy:set`                                                                                                                                | |
 | `DOKKU_APP_RESTORE`            | `1`                             | `dokku config:set` <br /> `dokku ps:stop`                                                                                                        | |
 | `DOKKU_APP_SHELL`              | `/bin/bash`                     | `dokku config:set`                                                                                                                               | Allows users to change the default shell used by Dokku for `dokku enter` and execution of deployment tasks. |

docs/configuration/ssl.md

@@ -18,7 +18,7 @@ certs:update <app> CRT KEY               # Update an SSL Endpoint on an app. Can
 dokku nginx:import-ssl <app> < certs.tar
 ```
 
-> Adding an ssl certificate before deploying an application will result in port mappings being updated. This may cause issues for applications that use non-standard ports, as those may not be automatically detected. Please refer to the [proxy documentation](/docs/advanced-usage/proxy-management.md) for information as to how to reconfigure the mappings.
+> Adding an ssl certificate before deploying an application will result in port mappings being updated. This may cause issues for applications that use non-standard ports, as those may not be automatically detected. Please refer to the [proxy documentation](/docs/networking/proxy-management.md) for information as to how to reconfigure the mappings.
 
 ## Per-application certificate management
 
@@ -41,9 +41,9 @@ cat yourdomain_com.crt yourdomain_com.ca-bundle > server.crt
 
 #### SSL and Multiple Domains
 
-When an SSL certificate is associated to an application, the certificate will be associated with *all* domains currently associated with said application. Your certificate _should_ be associated with all of those domains, otherwise accessing the application will result in SSL errors. If you wish to remove one of the domains from the application, refer to the [domain configuration documentation](/docs/configuration/domains.md).
+When an SSL certificate is associated to an application, the certificate will be associated with _all_ domains currently associated with said application. Your certificate _should_ be associated with all of those domains, otherwise accessing the application will result in SSL errors. If you wish to remove one of the domains from the application, refer to the [domain configuration documentation](/docs/configuration/domains.md).
 
-Note that with the default nginx template, requests will be redirected to the `https` version of the domain. If this is not the desired state of request resolution, you may customize the nginx template in use. For more details, see the [nginx documentation](/docs/configuration/nginx.md).
+Note that with the default nginx template, requests will be redirected to the `https` version of the domain. If this is not the desired state of request resolution, you may customize the nginx template in use. For more details, see the [nginx documentation](/docs/networking/proxies/nginx.md).
 
 ### Certificate generation
 
@@ -126,7 +126,7 @@ dokku certs:report node-js-app --ssl-enabled
 
 The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. Dokku does enables this header by default for HTTPS requests.
 
-See the [NGINX HSTS documentation](/docs/configuration/nginx.md#hsts-header) for more information on how the HSTS configuration can be managed for your application.
+See the [NGINX HSTS documentation](/docs/networking/proxies/nginx.md#hsts-header) for more information on how the HSTS configuration can be managed for your application.
 
 ## HTTP/2 support
 
@@ -150,6 +150,19 @@ Only use this option if:
 
 If it's possible to make HTTP(S) requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
 
+The `x-forwarded-ssl` property may also be set for application frameworks that require this value. Note that this is a non-standard version of setting `x-forwarded-proto` to `https`, and should only be done as a last resort.
+
+```shell
+# force-setting value to `on`
+dokku nginx:set node-js-app x-forwarded-ssl on
+
+# force-setting value to `off`
+dokku nginx:set node-js-app x-forwarded-ssl on
+
+# removing the value from nginx.conf (default)
+dokku nginx:set node-js-app x-forwarded-ssl
+```
+
 ### SSL Port Exposure
 
 When your app is served from port `80` then the `/home/dokku/APP/nginx.conf` file will automatically be updated to instruct nginx to respond to ssl on port 443 as a new cert is added.  If your app uses a non-standard port (perhaps you have a dockerfile deploy exposing port `99999`) you may need to manually expose an ssl port via `dokku proxy:ports-add <APP> https:443:99999`.

docs/deployment/application-deployment.md

@@ -1,4 +1,4 @@
-# Deploying to Dokku
+# Deploying an Application
 
 > Note: This walkthrough uses the hostname `dokku.me` in commands. When deploying to your own server, you should substitute the domain `dokku.me` for the domain name or IP address associated with your server. Users of the Vagrant VM included with Dokku can use `dokku.me` which points to the IP of the VM.
 
@@ -102,10 +102,41 @@ Once the deploy is complete, the application's web URL will be generated as abov
 
 Dokku supports deploying applications in a few ways:
 
-- [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) via [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks): See the [herokuish buildpacks documentation](/docs/deployment/methods/herokuish-buildpacks.md) to learn about the different ways to specify a buildpack.
+- [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) via [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks): See the [herokuish buildpacks documentation](/docs/deployment/builders/herokuish-buildpacks.md) to learn about the different ways to specify a buildpack.
   - This is the default method used by Dokku.
-- [Dockerfile](https://docs.docker.com/reference/builder/): See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md) to learn about the different ways to configure Dockerfile-based deploys.
-- [Docker Image](https://docs.docker.com/get-started/overview/#docker-objects): See the [docker image documentation](/docs/deployment/methods/images.md) to learn about how to deploy a Docker Image.
+- [Dockerfile](https://docs.docker.com/reference/builder/): See the [dockerfile documentation](/docs/deployment/builders/dockerfiles.md) to learn about the different ways to configure Dockerfile-based deploys.
+- [Docker Image](https://docs.docker.com/get-started/overview/#docker-objects): See the [docker image documentation](/docs/deployment/methods/git.md#initializing-an-app-repository-from-a-docker-image) to learn about how to deploy a Docker Image.
+
+### Setting up SSL
+
+> While SSL certificates can be imported, automated SSL via Letsencrypt requires that all domains on an app correctly point at your server's public ip address. Please keep this in mind when using Letsencrypt.
+
+For many users, responding to requests via `https` will be desirable. Dokku has a complete [ssl plugin](/docs/configuration/ssl.md) built in that can be used to import SSL certificates (below is a short example, please refer to the [ssl documentation](/docs/configuration/ssl.md) for more information):
+
+```shell
+dokku certs:add ruby-getting-started server.crt server.key
+```
+
+As an alternative, the Dokku project offers an optional letsencrypt plugin that can be used to automate SSL certificate retrieval and renewal.
+
+```shell
+# on the Dokku host
+# install the letsencrypt plugin
+# plugin installation requires root, hence the user change
+sudo dokku plugin:install https://github.com/dokku/dokku-letsencrypt.git
+
+# configure the plugin
+dokku config:set --global DOKKU_LETSENCRYPT_EMAIL=your-email@your.domain.com
+
+# set a custom domain that you own for your application
+dokku domains:set ruby-getting-started ruby-getting-started.your.domain.com
+
+# enable letsencrypt
+dokku letsencrypt:enable ruby-getting-started
+
+# enable auto-renewal
+dokku letsencrypt:cron-job --add
+```
 
 ### Skipping deployment
 
@@ -125,7 +156,7 @@ If you need to redeploy or restart your app:
 dokku ps:rebuild ruby-getting-started
 ```
 
-See the [process scaling documentation](/docs/deployment/process-management.md) for more information on how to manage your app processes.
+See the [process scaling documentation](/docs/processes/process-management.md) for more information on how to manage your app processes.
 
 ### Deploying with private Git submodules
 
@@ -180,10 +211,12 @@ git remote add dokku dokku@dokku.me:dokku.me
 git push dokku main:master
 ```
 
-    ... deployment ...
+```
+... deployment ...
 
-    remote: -----> Application deployed:
-    remote:        http://dokku.me
+remote: -----> Application deployed:
+remote:        http://dokku.me
+```
 
 ## Dokku/Docker container management compatibility
 
@@ -205,15 +238,15 @@ See the [Git documentation](/docs/deployment/methods/git.md#changing-the-deploy-
 
 ## Dockerfile deployment
 
-See the [Dockerfile documentation](/docs/deployment/methods/dockerfiles.md) for information Dokku's Dockerfile support.
+See the [Dockerfile documentation](/docs/deployment/builders/dockerfiles.md) for information Dokku's Dockerfile support.
 
 ## Image tagging
 
-See the [image tagging documentation](/docs/deployment/methods/images.md) for more information on how Docker images can be tagged and deployed for a given application.
+See the [image tagging documentation](/docs/deployment/methods/git.md#initializing-an-app-repository-from-a-docker-image) for more information on how Docker images can be tagged and deployed for a given application.
 
 ## Specifying a custom buildpack
 
-See the [herokuish buildpack documentation](/docs/deployment/methods/herokuish-buildpacks.md) for more information on how to specify a set of custom buildpacks for your application.
+See the [herokuish buildpack documentation](/docs/deployment/builders/herokuish-buildpacks.md) for more information on how to specify a set of custom buildpacks for your application.
 
 ## Removing a deployed app