Release 0.26.5

# History

## 0.26.5

Install/update via the bootstrap script:

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

### Bug Fixes

- #4917: @josegonzalez Update golang to fix golang tests
- #4915: @josegonzalez Add support for --global flag to network:set command

### Documentation

- #4911: @josegonzalez Add initial dokku-pro documentation
- #4910: @josegonzalez Fix typo on persistent storage docs

### Tests

- #4916: @josegonzalez Ignore new SC2295 shellcheck warning
- #4906: @josegonzalez Upgrade ci linters

### Other

- #4914: @dependabot[bot] chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask

.github/workflows/lint.yml

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

HISTORY.md

@@ -1,5 +1,100 @@
 # History
 
+## 0.26.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh
+sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4917: @josegonzalez Update golang to fix golang tests
+- #4915: @josegonzalez Add support for --global flag to network:set command
+
+### Documentation
+
+- #4911: @josegonzalez Add initial dokku-pro documentation
+- #4910: @josegonzalez Fix typo on persistent storage docs
+
+### Tests
+
+- #4916: @josegonzalez Ignore new SC2295 shellcheck warning
+- #4906: @josegonzalez Upgrade ci linters
+
+### Other
+
+- #4914: @dependabot[bot] chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
+
+## 0.26.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.4/bootstrap.sh
+sudo DOKKU_TAG=v0.26.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4899: @josegonzalez Ensure we respect quotes and dollar signs in config vars
+- #4890: @josegonzalez Drop which in favor of command -v
+
+### Other
+
+- #4897: @josegonzalez Silence errors when verifying the ssl certificate
+- #4891: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 199 to 200 in /tests/apps/php
+
+## 0.26.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.3/bootstrap.sh
+sudo DOKKU_TAG=v0.26.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4889: @josegonzalez Skip herokuish version in report output and disable the herokuish builder on armhf architectures
+
+## 0.26.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.2/bootstrap.sh
+sudo DOKKU_TAG=v0.26.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4888: @josegonzalez Ensure installations treat raspbian as similar to debian buster as possible
+- #4887: @josegonzalez Ensure we do not add two debian folders in a single armhf package
+
+### New Features
+
+- #4886: @josegonzalez Add created-at time to apps:report output
+
+## 0.26.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.1/bootstrap.sh
+sudo DOKKU_TAG=v0.26.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4884: @josegonzalez Correct recommends entry for bash-completion
+
+### New Features
+
+- #4885: @josegonzalez Add experimental support for arm devices
+
 ## 0.26.0
 
 Install/update via the bootstrap script:

Makefile

@@ -110,7 +110,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:

README.md

@@ -98,8 +98,8 @@ Otherwise, you will need to import the keypair manually after installation using
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.26.0/bootstrap.sh
-sudo DOKKU_TAG=v0.26.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh
+sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
 ```
 
 You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.

bootstrap.sh

@@ -189,7 +189,7 @@ 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
@@ -204,6 +204,11 @@ install-dokku-from-deb-package() {
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
       OS_ID="bullseye"
     fi
+  elif [[ "$DOKKU_DISTRO" == "raspbian" ]]; then
+    OS_IDS=("buster")
+    if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
+      OS_ID="buster"
+    fi
   fi
 
   echo "--> Installing dokku"

common.mk

@@ -1,10 +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.16.10
 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
-GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
-GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT)
+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
 
@@ -20,7 +21,7 @@ build-in-docker: clean
 		-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-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
 
@@ -22,19 +22,41 @@ RUN make deb-setup rpm-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 rpm-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 rpm-dokku
+  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
 
 RUN ls -lha /tmp/

contrib/dokku_client.sh

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

contrib/release-dokku

@@ -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 "$?"
@@ -134,8 +135,19 @@ fn-publish-package() {
 
   [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
+  [[ "$RELEASE_TYPE" == "raspbian" ]] && DIST=raspbian
 
-  if [[ "$DIST" == "ubuntu" ]]; then
+  if [[ "$RELEASE_TYPE" == "raspbian" ]]; then
+    OS_IDS=("buster")
+    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")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
@@ -379,11 +391,13 @@ main() {
 
   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}_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
 
   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}_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"

deb.mk

@@ -1,8 +1,7 @@
-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
+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
@@ -45,9 +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"
-

debian/control

@@ -1,10 +1,10 @@
 Package: dokku
-Version: 0.26.0
+Version: 0.26.5
 Section: web
 Priority: optional
 Architecture: amd64
 Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.12.0), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-image-labeler (>= 0.2.2), net-tools, netrc, software-properties-common, parallel, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip
-Recommends: herokuish (>= 0.3.4), bash-completionl, dokku-update, dokku-event-listener
+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

docs/advanced-usage/persistent-storage.md

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

docs/advanced-usage/plugin-management.md

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

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

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

docs/assets/style.css

@@ -42,13 +42,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }

docs/assets/versions.json

@@ -23,6 +23,6 @@
     "0.23.9",
     "0.24.10",
     "0.25.7",
-    "0.26.0"
+    "0.26.5"
   ]
 }

docs/deployment/application-management.md

@@ -243,16 +243,19 @@ dokku apps:report
 
 ```
 =====> node-js-app app information
+       App created at:              1635126111
        App dir:                     /home/dokku/node-js-app
        App deploy source:           git
        App deploy source metadata:  cd7b8afccb202f222e7dc7b427553e71ba5ddafd
        App locked:                  false
 =====> python-sample app information
+       App created at:              1635126000
        App dir:                     /home/dokku/python-sample
        App deploy source:
        App deploy source metadata:
        App locked:                  false
 =====> ruby-sample app information
+       App created at:              1635122462
        App dir:                     /home/dokku/ruby-sample
        App deploy source:           git
        App deploy source metadata:  c60921ea2799ca108276414b95ea197f16798d51

docs/development/plugin-triggers.md

@@ -433,7 +433,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 export DEBIAN_FRONTEND=noninteractive
 
 case "$DOKKU_DISTRO" in
-  debian|ubuntu)
+  debian|raspbian|ubuntu)
     apt-get -qq -y --no-install-recommends install nginx
     ;;
 

docs/development/release-process.md

@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.26.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.26.5-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'

docs/enterprise/pro.md

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

docs/getting-started/install/docker.md

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

docs/getting-started/installation.md

@@ -19,8 +19,8 @@ To install the latest stable version of Dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.26.0/bootstrap.sh;
-sudo DOKKU_TAG=v0.26.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh;
+sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.

docs/home.html

@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
     </style>
@@ -62,6 +62,9 @@
               <li class="nav-item">
                 <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="/{{NAME}}/enterprise/pro/">Pro</a>
+              </li>
             </ul>
           </div>
         </div>
@@ -95,12 +98,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.26.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>

docs/template.html

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

plugins/00_dokku-standard/install

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

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/subcommands/report

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

plugins/20_events/install

@@ -17,7 +17,7 @@ trigger-events-install() {
   # shellcheck disable=SC2174
   mkdir -m 775 -p "$DOKKU_LOGS_DIR"
   case "$DOKKU_DISTRO" in
-    arch | debian | centos | fedora | rhel)
+    arch | debian | centos | fedora | raspbian | rhel)
       chgrp dokku "$DOKKU_LOGS_DIR"
       ;;
     *)
@@ -28,7 +28,7 @@ trigger-events-install() {
   if [[ ! -f "$DOKKU_EVENTS_LOGFILE" ]]; then
     touch "$DOKKU_EVENTS_LOGFILE"
     case "$DOKKU_DISTRO" in
-      arch | debian | centos | fedora | rhel)
+      arch | debian | centos | fedora | raspbian | rhel)
         chgrp dokku "$DOKKU_EVENTS_LOGFILE"
         ;;
       *)
@@ -70,7 +70,7 @@ $DOKKU_LOGS_DIR/*.log {
 }
 EOF
 
-    if [[ "$DOKKU_DISTRO" == "debian" ]]; then
+    if [[ "$DOKKU_DISTRO" == "debian" ]] || [[ "$DOKKU_DISTRO" == "raspbian" ]]; then
       sed -i 's/ syslog dokku$/ root dokku/g' $DOKKU_LOGROTATE_FILE
     fi
 

plugins/20_events/plugin.toml

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

plugins/app-json/go.mod

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

plugins/app-json/plugin.toml

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

plugins/apps/go.mod

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

plugins/apps/plugin.toml

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

plugins/apps/report.go

@@ -1,6 +1,9 @@
 package apps
 
 import (
+	"fmt"
+	"os"
+
 	"github.com/dokku/dokku/plugins/common"
 )
 
@@ -11,6 +14,7 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 	}
 
 	flags := map[string]common.ReportFunc{
+		"--app-created-at":             reportCreatedAt,
 		"--app-deploy-source":          reportDeploySource,
 		"--app-deploy-source-metadata": reportDeploySourceMetadata,
 		"--app-dir":                    reportDir,
@@ -28,6 +32,15 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 	return common.ReportSingleApp("app", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
 }
 
+func reportCreatedAt(appName string) string {
+	fi, err := os.Stat(common.AppRoot(appName))
+	if err != nil {
+		return ""
+	}
+
+	return fmt.Sprint(fi.ModTime().Unix())
+}
+
 func reportDeploySource(appName string) string {
 	return common.PropertyGet("apps", appName, "deploy-source")
 }

plugins/builder-dockerfile/plugin.toml

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

plugins/builder-herokuish/builder-detect

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

plugins/builder-herokuish/plugin.toml

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

plugins/builder-null/plugin.toml

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

plugins/builder-pack/plugin.toml

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

plugins/builder/go.mod

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

plugins/builder/plugin.toml

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

plugins/buildpacks/go.mod

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

plugins/buildpacks/plugin.toml

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

plugins/certs/internal-functions

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

plugins/certs/plugin.toml

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

plugins/checks/plugin.toml

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

plugins/common/go.mod

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

plugins/common/plugin.toml

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

plugins/config/docker-args-deploy

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

plugins/config/go.mod

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

plugins/config/plugin.toml

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

plugins/cron/go.mod

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

plugins/cron/plugin.toml

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

plugins/docker-options/go.mod

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

plugins/docker-options/plugin.toml

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

plugins/domains/plugin.toml

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

plugins/enter/plugin.toml

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

plugins/git/plugin.toml

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

plugins/logs/go.mod

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

plugins/logs/plugin.toml

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

plugins/network/go.mod

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

plugins/network/plugin.toml

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

plugins/network/src/subcommands/subcommands.go

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

plugins/nginx-vhosts/dependencies

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

plugins/nginx-vhosts/go.mod

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

plugins/nginx-vhosts/install

@@ -25,7 +25,7 @@ trigger-nginx-vhosts-install() {
   fi
 
   case "$DOKKU_DISTRO" in
-    debian)
+    debian | raspbian)
       echo "%dokku ALL=(ALL) NOPASSWD:/usr/sbin/invoke-rc.d $NGINX_INIT_NAME reload, $NGINX_BIN -t, ${NGINX_BIN} -t -c *" >"$NGINX_SUDOERS_FILE"
       ;;
 

plugins/nginx-vhosts/internal-functions

@@ -75,7 +75,7 @@ fn-nginx-vhosts-nginx-location() {
   declare desc="check that nginx is at the expected location and return it"
   local NGINX_LOCATION
 
-  NGINX_LOCATION=$(which nginx 2>/dev/null)
+  NGINX_LOCATION=$(command -v nginx 2>/dev/null)
   if [[ -z "$NGINX_LOCATION" ]]; then
     NGINX_LOCATION="/usr/sbin/nginx"
   fi
@@ -102,7 +102,7 @@ fn-nginx-vhosts-nginx-init-cmd() {
   fi
 
   case "$DOKKU_DISTRO" in
-    debian)
+    debian | raspbian)
       sudo /usr/sbin/invoke-rc.d "$NGINX_INIT_NAME" "$CMD"
       ;;
 

plugins/nginx-vhosts/plugin.toml

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

plugins/plugin/plugin.toml

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

plugins/proxy/go.mod

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

plugins/proxy/plugin.toml

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

plugins/ps/go.mod

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

plugins/ps/plugin.toml

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

plugins/registry/go.mod

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

plugins/registry/plugin.toml

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

plugins/repo/go.mod

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

plugins/repo/plugin.toml

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

plugins/resource/go.mod

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

plugins/resource/plugin.toml

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

plugins/run/plugin.toml

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

plugins/scheduler-docker-local/install

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

plugins/scheduler-docker-local/plugin.toml

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

plugins/scheduler-null/plugin.toml

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

plugins/scheduler/go.mod

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

plugins/shell/plugin.toml

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

plugins/ssh-keys/plugin.toml

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

plugins/storage/install

@@ -12,22 +12,7 @@ trigger-storage-install() {
   STORAGE_SUDOERS_FILE="/etc/sudoers.d/dokku-storage"
 
   case "$DOKKU_DISTRO" in
-    debian)
-      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
-      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
-      ;;
-
-    ubuntu)
-      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
-      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
-      ;;
-
-    opensuse)
-      echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
-      echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
-      ;;
-
-    arch)
+    arch | debian | opensuse | raspbian | ubuntu)
       echo "%dokku ALL=(ALL) NOPASSWD:$PLUGIN_AVAILABLE_PATH/storage/bin/chown-storage-dir *" >"$STORAGE_SUDOERS_FILE"
       echo "Defaults env_keep += \"DOKKU_LIB_ROOT\"" >>"$STORAGE_SUDOERS_FILE"
       ;;

plugins/storage/plugin.toml

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

plugins/trace/plugin.toml

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

tests/apps/php/composer.lock

@@ -1000,16 +1000,16 @@
     "packages-dev": [
         {
             "name": "heroku/heroku-buildpack-php",
-            "version": "v199",
+            "version": "v200",
             "source": {
                 "type": "git",
                 "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "1a4e5d3ffe128f8eb8a17e50616462d3c804e11f"
+                "reference": "ffa4d0e714439d6f54f9608a0aa16674e82ed0a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/1a4e5d3ffe128f8eb8a17e50616462d3c804e11f",
-                "reference": "1a4e5d3ffe128f8eb8a17e50616462d3c804e11f",
+                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/ffa4d0e714439d6f54f9608a0aa16674e82ed0a1",
+                "reference": "ffa4d0e714439d6f54f9608a0aa16674e82ed0a1",
                 "shasum": ""
             },
             "bin": [
@@ -1037,7 +1037,7 @@
                 "nginx",
                 "php"
             ],
-            "time": "2021-10-08T15:04:20+00:00"
+            "time": "2021-10-28T22:02:01+00:00"
         }
     ],
     "aliases": [],

tests/apps/python-flask/requirements.txt

@@ -1,5 +1,5 @@
 Flask==2.0.2
-Jinja2==3.0.2
+Jinja2==3.0.3
 Werkzeug==2.0.2
 gunicorn==20.1.0
 

tests/apps/zombies-buildpack/go.mod

@@ -1,4 +1,4 @@
 module dokku.me/web
 
-// +heroku goVersion go1.12
-go 1.12
+// +heroku goVersion go1.16
+go 1.16

tests/apps/zombies-dockerfile-no-tini/go.mod

@@ -1,3 +1,3 @@
 module dokku.me/web
 
-go 1.12
+go 1.16

tests/apps/zombies-dockerfile-tini/go.mod

@@ -1,3 +1,3 @@
 module dokku.me/web
 
-go 1.12
+go 1.16

tests/ci/setup.sh

@@ -55,6 +55,7 @@ install_dependencies() {
   sudo apt-get -qq -y --no-install-recommends install cgroupfs-mount dos2unix jq nginx debconf-utils
   sudo cp "${ROOT_DIR}/tests/dhparam.pem" /etc/nginx/dhparam.pem
 
+  ls -lah "${ROOT_DIR}/build/"
   sudo dpkg -i \
     "${ROOT_DIR}/build/$DOCKER_IMAGE_LABELER_PACKAGE_NAME" \
     "${ROOT_DIR}/build/$HEROKUISH_PACKAGE_NAME" \

tests/shellcheck-exclude

@@ -26,7 +26,7 @@
 # SC2207 - Prefer mapfile or read -a to split command output (or quote to avoid splitting) - https://github.com/koalaman/shellcheck/wiki/SC2207
 # SC2219 - Instead of 'let expr', prefer (( expr ))  - https://github.com/koalaman/shellcheck/wiki/SC2219
 # SC2220 - Invalid flags are not handled. Add a *) case - https://github.com/koalaman/shellcheck/wiki/SC2220
-# SC2230 - which is non-standard. Use builtin 'command -v' instead - https://github.com/koalaman/shellcheck/wiki/SC2230
 # SC2231 - Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt  - https://github.com/koalaman/shellcheck/wiki/SC2231
 # SC2235 - Use { ..; } instead of (..) to avoid subshell overhead - https://github.com/koalaman/shellcheck/wiki/SC2235
 # SC2267 - GNU xargs -i is deprecated in favor of -I{} - https://github.com/koalaman/shellcheck/wiki/SC2267
+# SC2295 - Expansions inside ${..} need to be quoted separately, otherwise they match as patterns - https://github.com/koalaman/shellcheck/wiki/SC2295

tests/test_deploy

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xeo pipefail
 
-SELF=$(which "$0")
+SELF=$(command -v "$0")
 APP="$1"
 TARGET="$2"
 FORWARDED_PORT="$3"

tests/unit/config.bats

@@ -169,7 +169,33 @@ teardown() {
 }
 
 @test "(config) global config (herokuish)" {
-  deploy_app
+  run /bin/bash -c "dokku config:set --global HASURA_GRAPHQL_JWT_SECRET='{ \"type\": \"HS256\", \"key\": \"347a4efd2dbb6b91aebf38db5dcf2c4e\" }'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku config:set --global VAR='\$123*&456$'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run deploy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku run $TEST_APP env | grep -E '^HASURA_GRAPHQL_JWT_SECRET='"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains '{ "type": "HS256", "key": "347a4efd2dbb6b91aebf38db5dcf2c4e" }'
+
+  run /bin/bash -c "dokku run $TEST_APP env | grep -E '^VAR='"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains '123*&456$'
+
   run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
   echo "output: $output"
   echo "status: $status"
@@ -177,7 +203,7 @@ teardown() {
 }
 
 @test "(config) global config (dockerfile)" {
-  deploy_app dockerfile
+  run deploy_app dockerfile
   run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
   echo "output: $output"
   echo "status: $status"