Release 0.18.2

# History ## 0.18.2 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh sudo DOKKU_TAG=v0.18.2 bash bootstrap.sh ``` ### New Features - #3645: @josegonzalez Use version in DOKKU_LIB_ROOT - #3644: @josegonzalez Refactor temp file handling - #3643: @josegonzalez Quiet deploy output - #3641: @josegonzalez Pass SOURCECODE_WORK_DIR to build-buildpack triggers - #3639: @josegonzalez Refer to upstream sshcommand package ### Documentation - #3642: @josegonzalez Correct issue with label change in docs - #3640: @josegonzalez Add missing popd to post-extract example
fix: remove the build-env plugin from rpm installs
2019-08-13 13:57:56 -04:00 · 2019-08-13 13:57:19 -04:00 · 2019-08-13 01:59:44 -04:00 · 2019-08-13 00:53:49 -04:00 · 2019-08-12 19:27:24 -04:00 · 2019-08-12 18:16:16 -04:00
76 changed files with 348 additions and 335 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,41 @@
 # History

+## 0.18.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh
+sudo DOKKU_TAG=v0.18.2 bash bootstrap.sh
+```
+
+### New Features
+
+- #3645: @josegonzalez Use version in DOKKU_LIB_ROOT
+- #3644: @josegonzalez Refactor temp file handling
+- #3643: @josegonzalez Quiet deploy output
+- #3641: @josegonzalez Pass SOURCECODE_WORK_DIR to build-buildpack triggers
+- #3639: @josegonzalez Refer to upstream sshcommand package
+
+### Documentation
+
+- #3642: @josegonzalez Correct issue with label change in docs
+- #3640: @josegonzalez Add missing popd to post-extract example
+
+## 0.18.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.18.1/bootstrap.sh
+sudo DOKKU_TAG=v0.18.1 bash bootstrap.sh
+```
+
+### New Features
+
+- #3636: @josegonzalez Unify deb and rpm creation code
+- #3635: @josegonzalez Upgrade herokuish to 0.5.2
+
 ## 0.18.0

 Install/update via the bootstrap script:
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -39,4 +39,4 @@
  - If using a `Dockerfile`, the contents of that file
  - If it exists, the contents of your `Procfile`.
 - Output of failing Dokku commands after running `dokku trace:on`
-  (BEWARE: `trace:on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+  (BEWARE: `trace:on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXX):
--- a/12
+++ b/12
@@ -2,7 +2,8 @@ DOKKU_VERSION ?= master

 PROCFILE_VERSION ?= 0.6.0
 PLUGN_VERSION ?= 0.3.2
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand
+SSHCOMMAND_VERSION ?= 0.8.0
+SSHCOMMAND_URL ?= https://github.com/dokku/sshcommand/releases/download/v${SSHCOMMAND_VERSION}/sshcommand_${SSHCOMMAND_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
 PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v${PLUGN_VERSION}/plugn_${PLUGN_VERSION}_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
@@ -107,10 +108,11 @@ addman: help2man man-db
 	mandb

 version:
+	mkdir -p ${DOKKU_LIB_ROOT}
 ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > ~dokku/VERSION  2>/dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
+	git describe --tags > ${DOKKU_LIB_ROOT}/VERSION  2>/dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ${DOKKU_LIB_ROOT}/VERSION
 else
-	echo $(DOKKU_VERSION) > ~dokku/VERSION
+	echo $(DOKKU_VERSION) > ${DOKKU_LIB_ROOT}/STABLE_VERSION
 endif

 plugin-dependencies: plugn procfile-util
@@ -135,8 +137,8 @@ man-db:
 	apt-get install -qq -y man-db

 sshcommand:
-	wget -qO /usr/local/bin/sshcommand ${SSHCOMMAND_URL}
-	chmod +x /usr/local/bin/sshcommand
+	wget -qO /tmp/procfile-util_latest.tgz ${SSHCOMMAND_URL}
+	tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin
 	sshcommand create dokku /usr/local/bin/dokku

 procfile-util:
--- a/README.md
+++ b/README.md
@@ -96,8 +96,8 @@ A fresh VM running any of the following operating systems:
 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.18.0/bootstrap.sh
-sudo DOKKU_TAG=v0.18.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh
+sudo DOKKU_TAG=v0.18.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.
--- a/contrib/build-dokku.Dockerfile
+++ b/contrib/build-dokku.Dockerfile
@@ -36,7 +36,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
    SKIP_GO_CLEAN=true \
    make version copyfiles \
    && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
-    && make deb-dokku deb-sshcommand deb-sigil \
-            rpm-dokku rpm-sshcommand rpm-sigil
+    && make deb-dokku deb-sigil \
+            rpm-dokku rpm-sigil

 RUN ls -lha /tmp/
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.18.0'
+VERSION = 'v0.18.2'

 hostname = ''
 try:
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -3,7 +3,7 @@ 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.XXXX")"
+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
--- a/contrib/release-dokku-update
+++ b/contrib/release-dokku-update
@@ -3,7 +3,7 @@ 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.XXXX")"
+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
--- a/contrib/release-herokuish
+++ b/contrib/release-herokuish
@@ -3,7 +3,7 @@ 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.XXXX")"
+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
--- a/contrib/release-plugin
+++ b/contrib/release-plugin
@@ -2,7 +2,7 @@
 set -eo pipefail
 [[ $TRACE ]] && set -x

-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXX")"
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXXXX")"

 trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

--- a/deb.mk
+++ b/deb.mk
@@ -2,7 +2,7 @@ BUILD_DIRECTORY ?= /tmp

 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.5.0
+HEROKUISH_VERSION ?= 0.5.2
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb

@@ -16,17 +16,6 @@ DOKKU_UPDATE_VERSION ?= 0.1.0
 DOKKU_UPDATE_ARCHITECTURE = amd64
 DOKKU_UPDATE_PACKAGE_NAME = dokku-update_$(DOKKU_UPDATE_VERSION)_$(DOKKU_UPDATE_ARCHITECTURE).deb

-define SSHCOMMAND_DESCRIPTION
-Turn SSH into a thin client specifically for your app
-Simplifies running a single command over SSH, and
-manages authorized keys (ACL) and users in order to do so.
-endef
-SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
-SSHCOMMAND_VERSION ?= 0.7.0
-SSHCOMMAND_ARCHITECTURE = amd64
-SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand
-
 define SIGIL_DESCRIPTION
 Standalone string interpolator and template processor
 Sigil is a command line tool for template processing
@@ -45,9 +34,8 @@ ifndef IS_RELEASE
 endif

 export SIGIL_DESCRIPTION
-export SSHCOMMAND_DESCRIPTION

-.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-setup deb-sshcommand deb-sigil
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-setup deb-sigil

 install-from-deb:
 	@echo "--> Initial apt-get update"
@@ -63,7 +51,7 @@ install-from-deb:
 	sudo apt-get update -qq >/dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku

-deb-all: deb-setup deb-herokuish deb-dokku deb-sshcommand deb-sigil deb-dokku-update
+deb-all: deb-setup deb-herokuish deb-dokku deb-sigil deb-dokku-update
 	mv $(BUILD_DIRECTORY)/*.deb .
 	@echo "Done"

@@ -129,30 +117,6 @@ deb-dokku-update:
 			 contrib/dokku-update=/usr/local/bin/dokku-update \
 			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION

-deb-sshcommand:
-	rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
-
-	@echo "-> Downloading package"
-	wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL)
-
-	@echo "-> Copying files into place"
-	mkdir -p "/tmp/build/usr/local/bin"
-	cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/local/bin/sshcommand
-	chmod +x /tmp/build/usr/local/bin/sshcommand
-
-	@echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \
-			 --version $(SSHCOMMAND_VERSION) \
-			 --architecture $(SSHCOMMAND_ARCHITECTURE) \
-			 --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_PACKAGE_NAME) \
-			 --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \
-			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
-			 --category admin \
-			 --description "$$SSHCOMMAND_DESCRIPTION" \
-			 --license 'MIT License' \
-			 .
-
 deb-sigil:
 	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.18.0
+Version: 0.18.2
 Section: web
 Priority: optional
 Architecture: amd64
--- a/debian/postinst
+++ b/debian/postinst
@@ -26,6 +26,115 @@ call-sshcommand() {
  fi
 }

+setup-user() {
+  echo "Setting up dokku user"
+  call-sshcommand create dokku /usr/bin/dokku
+  egrep -i "^docker" /etc/group || groupadd docker
+  usermod -aG docker dokku
+  mkdir -p "$DOKKU_ROOT/.ssh" "$DOKKU_ROOT/.dokkurc"
+  touch "$DOKKU_ROOT/.ssh/authorized_keys"
+  chown -R dokku:dokku "$DOKKU_ROOT/.ssh" "${DOKKU_ROOT}/.dokkurc"
+}
+
+setup-storage() {
+  echo "Setting up storage directories"
+  mkdir -p "${DOKKU_LIB_ROOT}/data" "${DOKKU_LIB_ROOT}/data/storage"
+  chown dokku:dokku "${DOKKU_LIB_ROOT}/data"
+}
+
+setup-plugins() {
+  echo "Setting up plugin directories"
+  # should be replaced by `plugn init`
+  mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/available" "${DOKKU_LIB_ROOT}/plugins/available"
+  mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/enabled" "${DOKKU_LIB_ROOT}/plugins/enabled"
+  touch "${DOKKU_LIB_ROOT}/core-plugins/config.toml" "${DOKKU_LIB_ROOT}/plugins/config.toml"
+
+  echo "Migrating old plugins"
+  find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
+      continue
+    elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
+      rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
+    elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+      mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
+    fi
+  done
+
+  db_get "dokku/nginx_enable"
+  echo "Enabling all core plugins"
+  find "${DOKKU_LIB_ROOT}/core-plugins/available" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    if [ "$plugin" = "nginx-vhosts" ] && [ "$RET" = "false" ]; then
+      echo "Skipping enable of nginx-vhosts plugin"
+      continue
+    elif [ ! -d "${DOKKU_LIB_ROOT}/plugins/available/$plugin" ]; then
+      ln -s "${DOKKU_LIB_ROOT}/core-plugins/available/$plugin" "${DOKKU_LIB_ROOT}/plugins/available/$plugin"
+      PLUGIN_PATH="${DOKKU_LIB_ROOT}/core-plugins" plugn enable "$plugin"
+      PLUGIN_PATH="${DOKKU_LIB_ROOT}/plugins" plugn enable "$plugin"
+    fi
+  done
+  find -L "${DOKKU_LIB_ROOT}" -type l -delete
+  chown dokku:dokku -R "${DOKKU_LIB_ROOT}/plugins" "${DOKKU_LIB_ROOT}/core-plugins"
+
+  echo "Install all core plugins"
+  dokku plugin:install --core
+}
+
+setup-sshcommand() {
+  echo "Ensure proper sshcommand path"
+  echo '/usr/bin/dokku' >"${DOKKU_ROOT}/.sshcommand"
+  if [[ -f .ssh/authorized_keys ]]; then
+    sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
+    rm "${DOKKU_ROOT}/.ssh/authorized_keys"
+  fi
+}
+
+setup-dokku-installer() {
+  if [[ -f /etc/nginx/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
+    db_get "dokku/vhost_enable"
+    if [ "$RET" = "true" ]; then
+      db_get "dokku/hostname"
+      echo "Setting VHOST contents to $RET"
+      echo "$RET" >"${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
+      call-sshcommand acl-add dokku default <"$RET" || true
+    fi
+  fi
+}
+
 case "$1" in
  abort-upgrade | abort-remove | abort-deconfigure) ;;

@@ -36,103 +145,13 @@ case "$1" in
    if [[ -f /sbin/modprobe ]]; then
      modprobe aufs || echo "WARNING: Restart server to finish installing dokku!"
    fi
-    call-sshcommand create dokku /usr/bin/dokku

-    egrep -i "^docker" /etc/group || groupadd docker
-    usermod -aG docker dokku
-    mkdir -p ${DOKKU_ROOT}/.dokkurc
-
-    echo "Setting up storage directories"
-    mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-    chown dokku:dokku ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-
-    echo "Setting up plugin directories"
-    # should be replaced by `plugn init`
-    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/available ${DOKKU_LIB_ROOT}/plugins/available
-    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/enabled ${DOKKU_LIB_ROOT}/plugins/enabled
-    touch ${DOKKU_LIB_ROOT}/core-plugins/config.toml ${DOKKU_LIB_ROOT}/plugins/config.toml
-
-    echo "Migrating old plugins"
-    find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-      if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
-        continue
-      elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
-        rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
-      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
-      fi
-    done
-
-    db_get "dokku/nginx_enable"
-    echo "Enabling all core plugins"
-    find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-      if [ "$plugin" = "nginx-vhosts" ] && [ "$RET" = "false" ]; then
-        echo "Skipping enable of nginx-vhosts plugin"
-        continue
-      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin
-        PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
-        PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
-      fi
-    done
-    find -L ${DOKKU_LIB_ROOT} -type l -delete
-    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
-
-    echo "Ensure proper sshcommand path"
-    echo '/usr/bin/dokku' >"${DOKKU_ROOT}/.sshcommand"
-    if [[ -f .ssh/authorized_keys ]]; then
-      sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
-      rm "${DOKKU_ROOT}/.ssh/authorized_keys"
-    fi
-
-    echo "Install all core plugins"
-    dokku plugin:install --core
-
-    rm -f ${DOKKU_ROOT}/VERSION
-    cp ${DOKKU_LIB_ROOT}/STABLE_VERSION ${DOKKU_ROOT}/VERSION
-
-    if [[ -f /etc/nginx/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
-
-    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
-      db_get "dokku/vhost_enable"
-      if [ "$RET" = "true" ]; then
-        db_get "dokku/hostname"
-        echo "Setting VHOST contents to $RET"
-        echo "$RET" >"${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
-        call-sshcommand acl-add dokku default <"$RET" || true
-      fi
-    fi
+    setup-user
+    setup-storage
+    setup-plugins
+    setup-sshcommand
+    setup-dokku-installer
+    dpkg-handling
    ;;

  *)
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -32,35 +32,35 @@ dokku plugin:list

 ```
 plugn: dev
-  00_dokku-standard    0.18.0 enabled    dokku core standard plugin
-  20_events            0.18.0 enabled    dokku core events logging plugin
-  app-json             0.18.0 enabled    dokku core app-json plugin
-  apps                 0.18.0 enabled    dokku core apps plugin
-  build-env            0.18.0 enabled    dokku core build-env plugin
-  buildpacks           0.18.0 enabled    dokku core buildpacks plugin
-  certs                0.18.0 enabled    dokku core certificate management plugin
-  checks               0.18.0 enabled    dokku core checks plugin
-  common               0.18.0 enabled    dokku core common plugin
-  config               0.18.0 enabled    dokku core config plugin
-  docker-options       0.18.0 enabled    dokku core docker-options plugin
-  domains              0.18.0 enabled    dokku core domains plugin
-  enter                0.18.0 enabled    dokku core enter plugin
-  git                  0.18.0 enabled    dokku core git plugin
-  logs                 0.18.0 enabled    dokku core logs plugin
-  network              0.18.0 enabled    dokku core network plugin
-  nginx-vhosts         0.18.0 enabled    dokku core nginx-vhosts plugin
-  plugin               0.18.0 enabled    dokku core plugin plugin
-  proxy                0.18.0 enabled    dokku core proxy plugin
-  ps                   0.18.0 enabled    dokku core ps plugin
-  repo                 0.18.0 enabled    dokku core repo plugin
-  resource             0.18.0 enabled    dokku core resource plugin
-  scheduler-docker-local 0.18.0 enabled    dokku core scheduler-docker-local plugin
-  shell                0.18.0 enabled    dokku core shell plugin
-  ssh-keys             0.18.0 enabled    dokku core ssh-keys plugin
-  storage              0.18.0 enabled    dokku core storage plugin
-  tags                 0.18.0 enabled    dokku core tags plugin
-  tar                  0.18.0 enabled    dokku core tar plugin
-  trace                0.18.0 enabled    dokku core trace plugin
+  00_dokku-standard    0.18.2 enabled    dokku core standard plugin
+  20_events            0.18.2 enabled    dokku core events logging plugin
+  app-json             0.18.2 enabled    dokku core app-json plugin
+  apps                 0.18.2 enabled    dokku core apps plugin
+  build-env            0.18.2 enabled    dokku core build-env plugin
+  buildpacks           0.18.2 enabled    dokku core buildpacks plugin
+  certs                0.18.2 enabled    dokku core certificate management plugin
+  checks               0.18.2 enabled    dokku core checks plugin
+  common               0.18.2 enabled    dokku core common plugin
+  config               0.18.2 enabled    dokku core config plugin
+  docker-options       0.18.2 enabled    dokku core docker-options plugin
+  domains              0.18.2 enabled    dokku core domains plugin
+  enter                0.18.2 enabled    dokku core enter plugin
+  git                  0.18.2 enabled    dokku core git plugin
+  logs                 0.18.2 enabled    dokku core logs plugin
+  network              0.18.2 enabled    dokku core network plugin
+  nginx-vhosts         0.18.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.18.2 enabled    dokku core plugin plugin
+  proxy                0.18.2 enabled    dokku core proxy plugin
+  ps                   0.18.2 enabled    dokku core ps plugin
+  repo                 0.18.2 enabled    dokku core repo plugin
+  resource             0.18.2 enabled    dokku core resource plugin
+  scheduler-docker-local 0.18.2 enabled    dokku core scheduler-docker-local plugin
+  shell                0.18.2 enabled    dokku core shell plugin
+  ssh-keys             0.18.2 enabled    dokku core ssh-keys plugin
+  storage              0.18.2 enabled    dokku core storage plugin
+  tags                 0.18.2 enabled    dokku core tags plugin
+  tar                  0.18.2 enabled    dokku core tar plugin
+  trace                0.18.2 enabled    dokku core trace plugin
 ```

 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-310x150.png"/>
      <TileColor>#da532c</TileColor>
    </tile>
  </msapplication>
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
    "name": "Dokku",
    "icons": [
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.0\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.18.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0"
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -39,13 +39,13 @@ h1 {
  font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/dokku.png);
  text-indent: 40px;
 }
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -15,6 +15,6 @@
    "0.15.5",
    "0.16.4",
    "0.17.9",
-    "0.18.0"
+    "0.18.2"
  ]
 }
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -180,7 +180,7 @@ Note that where possible, a label `com.dokku.app-name=$APP` - where `$APP` is th
 # `docker commit` example
 # Note that the arguments must be set as a local array
 # as arrays cannot be exported in shell
-local DOKKU_COMMIT_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL $DOKKU_CONTAINER_LABEL")
+local DOKKU_COMMIT_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL $DOKKU_CONTAINER_LABEL=")
 "$DOCKER_BIN" commit --change "LABEL com.dokku.app-name=$APP" "${DOKKU_COMMIT_ARGS[@]}" ...

 # `docker run` example
@@ -194,7 +194,7 @@ Avoid copying files from running containers as these files may change over time.
 ```shell
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

-local TMP_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
 trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM

 local IMAGE_TAG="$(get_running_image_tag "$APP")"
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -745,7 +745,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

 - Description: Allows you to run commands after the build image is create for a given app. Only applies to apps using buildpacks.
 - Invoked by: `internal function dokku_build() (build phase)`
- Arguments: `$APP`
+- Arguments: `$APP` `$SOURCECODE_WORK_DIR`
 - Example:

 ```shell
@@ -915,6 +915,7 @@ REV="$3" # optional, may not be sent for tar-based builds
 pushd "$TMP_WORK_DIR" >/dev/null
 touch Procfile
 echo "clock: some-command" >> Procfile
+popd >/dev/null
 ```

 ### `post-proxy-ports-update`
@@ -1005,7 +1006,7 @@ dokku config:set --no-restart $APP MANUALLY_STOPPED=1

 - Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to apps using buildpacks.
 - Invoked by: `internal function dokku_build() (build phase)`
- Arguments: `$APP`
+- Arguments: `$APP` `$SOURCECODE_WORK_DIR`
 - Example:

 ```shell
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.18.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.18.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
--- a/docs/getting-started/install/docker.md
+++ b/docs/getting-started/install/docker.md
@@ -3,7 +3,7 @@
 Pull the dokku/dokku image:

 ```shell
-docker pull dokku/dokku:v0.17.7
+docker pull dokku/dokku:0.18.2
 ```

 Next, run the image.
@@ -17,7 +17,7 @@ docker run \
  --publish 8443:443 \
  --volume /var/lib/dokku:/mnt/dokku \
  --volume /var/run/docker.sock:/var/run/docker.sock \
-  dokku/dokku:v0.17.7
+  dokku/dokku:0.18.2
 ```

 Dokku is run with the following options:
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,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.18.0/bootstrap.sh;
-sudo DOKKU_TAG=v0.18.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.18.2 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
@@ -54,6 +54,7 @@ For various reasons, certain hosting providers may have other steps that should
 As well, you may wish to customize your installation in some other fashion. or experiment with Vagrant. The guides below should get you started:

 - [Debian Package Installation Notes](/docs/getting-started/install/debian.md)
+- [Docker-based Installation Notes](/docs/getting-started/install/docker.md)
 - [RPM Package Installation Notes](/docs/getting-started/install/rpm.md)
 - [Vagrant Installation Notes](/docs/getting-started/install/vagrant.md)
 - [Advanced Install Customization](/docs/getting-started/advanced-installation.md)
--- a/docs/home.html
+++ b/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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.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.18.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/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.18.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/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.18.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <style>
      .sponsors {
@@ -127,12 +127,12 @@
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.18.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.18.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.18.2 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
    <meta name="author" content="">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.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.18.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/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.18.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/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.18.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.18.2/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>
--- a/10
+++ b/10
@@ -56,6 +56,7 @@ export DOKKU_SYSTEM_USER=${DOKKU_SYSTEM_USER:="dokku"}
 export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0
+export DOKKU_PID="$BASHPID"

 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
@@ -243,8 +244,13 @@ case "$1" in
    ;;

  version | -v | --version)
-    test -f "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
-    DOKKU_VERSION=$(cat "${DOKKU_ROOT}/VERSION")
+    if [[ -f "$DOKKU_LIB_ROOT/STABLE_VERSION" ]]; then
+      DOKKU_VERSION=$(cat "${DOKKU_LIB_ROOT}/STABLE_VERSION")
+    elif [[ -f "$DOKKU_LIB_ROOT/VERSION" ]]; then
+      DOKKU_VERSION=$(cat "${DOKKU_LIB_ROOT}/VERSION")
+    else
+      dokku_log_fail "Unable to determine dokku's version"
+    fi
    echo "dokku version ${DOKKU_VERSION}"
    ;;

--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -8,9 +8,8 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 get_phase_script() {
  declare desc="extracts app.json from app image and returns the appropriate json key/value"
  declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2"
-  local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
-  local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json"
-  trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM
+  local APP_JSON_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+  trap "rm -rf '$APP_JSON_FILE' >/dev/null" RETURN INT TERM

  copy_from_image "$IMAGE" "app.json" "$APP_JSON_FILE" 2>/dev/null || true

--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/builder-dockerfile/plugin.toml
+++ b/plugins/builder-dockerfile/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-dockerfile plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/builder-herokuish/builder-build
+++ b/plugins/builder-herokuish/builder-build
@@ -33,7 +33,7 @@ trigger-builder-build-builder-herokuish() {

  "$DOCKER_BIN" commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
  [[ -d $DOKKU_APP_CACHE_DIR ]] || mkdir -p "$DOKKU_APP_CACHE_DIR"
-  plugn trigger pre-build-buildpack "$APP"
+  plugn trigger pre-build-buildpack "$APP" "$SOURCECODE_WORK_DIR"

  local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE")
  [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
@@ -48,7 +48,7 @@ trigger-builder-build-builder-herokuish() {

  "$DOCKER_BIN" commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null

-  plugn trigger post-build-buildpack "$APP"
+  plugn trigger post-build-buildpack "$APP" "$SOURCECODE_WORK_DIR"
 }

 trigger-builder-build-builder-herokuish "$@"
--- a/plugins/builder-herokuish/plugin.toml
+++ b/plugins/builder-herokuish/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-herokuish plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -42,7 +42,7 @@ certs_set() {
    # importing from file
    true
  elif is_tar_import; then
-    local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+    local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
    pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null
    trap "popd &>/dev/null || true; rm -rf '$CERTS_SET_TMP_WORK_DIR' >/dev/null" RETURN
    tar xvf - <&0
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -13,7 +13,7 @@ certs_generate_cmd() {
  local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"

  if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then
-    local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+    local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
    pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null
    trap "popd &>/dev/null || true; rm -rf '$CERTS_GENERATE_TMP_WORK_DIR' >/dev/null" INT TERM EXIT

--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -390,8 +390,8 @@ copy_from_image() {
      fi
    fi

-    TMP_FILE_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
-    trap "rm -rf '$TMP_FILE_COMMAND_OUTPUT' >/dev/null || true" RETURN
+    TMP_FILE_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+    trap "rm -rf '$TMP_FILE_COMMAND_OUTPUT' >/dev/null 2>&1 || true" RETURN

    local CID=$("$DOCKER_BIN" create "${DOCKER_CREATE_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS "$IMAGE")
    "$DOCKER_BIN" cp "$CID:$SRC_FILE" "$TMP_FILE_COMMAND_OUTPUT" 2>/dev/null || true
@@ -1029,7 +1029,7 @@ release_advisory_lock() {
 suppress_output() {
  declare desc="suppress all output from a given command unless there is an error"
  local TMP_COMMAND_OUTPUT
-  TMP_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  TMP_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TMP_COMMAND_OUTPUT' >/dev/null" RETURN

  "$@" >"$TMP_COMMAND_OUTPUT" 2>&1 || {
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -31,7 +31,7 @@ git_build_app_repo() {
  verify_app_name "$APP"

  # clean up after ourselves
-  local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT

  local TMP_TAG="dokku/$REV"
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -300,8 +300,8 @@ nginx_build_config() {
    done
    local PROXY_UPSTREAM_PORTS="$(echo "$PROXY_UPSTREAM_PORTS" | xargs)"

-    local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
-    local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXX")
+    local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+    local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX")
    local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME"
    # shellcheck disable=SC2086
    trap "rm -rf '$NGINX_CONF' '$NGINX_BUILD_CONFIG_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
--- a/plugins/nginx-vhosts/internal-functions
+++ b/plugins/nginx-vhosts/internal-functions
@@ -27,7 +27,7 @@ nginx_vhosts_is_valid_nginx_config_func() {
  declare desc="checks if an app has a valid nginx config"
  declare APP="$1"
  local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil"
-  local TMP_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  local TMP_OUTPUT=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TMP_OUTPUT' >/dev/null" RETURN INT TERM EXIT

  sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT"
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -71,7 +71,7 @@ generate_scale_file() {
  if [[ ! -f $DOKKU_SCALE_FILE ]]; then
    dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."

-    local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+    local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
    trap "rm -rf '$GENERATE_SCALE_FILE_TMP_WORK_DIR' >/dev/null" RETURN

    if [[ -f $DOKKU_PROCFILE ]]; then
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -80,7 +80,7 @@ scheduler-docker-local-check-deploy() {
  # use this number of retries for checks
  local ATTEMPTS="${DOKKU_CHECKS_ATTEMPTS:-5}"

-  local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  local CHECKS_FILENAME=${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS
  local IMAGE_TAG="$(get_running_image_tag "$APP")"
  local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
--- a/plugins/scheduler-docker-local/core-post-deploy
+++ b/plugins/scheduler-docker-local/core-post-deploy
@@ -15,6 +15,7 @@ scheduler-docker-local-core-post-deploy() {
    return
  fi

+  dokku_log_info1 "Renaming containers"
  local PROCTYPES="$(egrep -v "^#" "$DOKKU_ROOT/$APP/DOKKU_SCALE" | awk -F '=' '{ print $1 }' | xargs)"
  local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 3 -n | xargs)"

@@ -22,7 +23,7 @@ scheduler-docker-local-core-post-deploy() {
  for CONTAINER_FILE in $CONTAINER_FILES; do
    local CONTAINER_TYPE="$(awk -F '.' '{ print $2 }' <<<"$CONTAINER_FILE")"
    if [[ "$(is_val_in_list "$CONTAINER_TYPE" "$PROCTYPES" " ")" == "false" ]]; then
-      dokku_log_info1 "Container type ($CONTAINER_TYPE) is no longer defined. Removing state"
+      dokku_log_verbose_quiet "Container type ($CONTAINER_TYPE) is no longer defined. Removing state"
      local IP_FILE="${CONTAINER_FILE//CONTAINER/IP}"
      local PORT_FILE="${CONTAINER_FILE//CONTAINER/PORT}"
      rm -f "$DOKKU_ROOT/$APP/$CONTAINER_FILE" "$DOKKU_ROOT/$APP/$IP_FILE" "$DOKKU_ROOT/$APP/$PORT_FILE"
@@ -38,7 +39,7 @@ scheduler-docker-local-core-post-deploy() {
    # TODO: Ensure these are from the current service
    local PREVIOUS_CIDS=$("$DOCKER_BIN" ps -a -q -f name="^.?$NAME\$" | xargs) || true
    if [[ -n $PREVIOUS_CIDS ]]; then
-      dokku_log_info1_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
+      dokku_log_verbose_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
      # in case $PREVIOUS_CIDS has more than one entry
      local cid
      for cid in $PREVIOUS_CIDS; do
@@ -46,7 +47,7 @@ scheduler-docker-local-core-post-deploy() {
        # dead containers cannot be renamed
        if [[ "$PREVIOUS_CONTAINER_STATUS" != "dead" ]]; then
          local CONTAINER_DATE_NAME="$NAME.$(date +%s)"
-          dokku_log_info2_quiet "Renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
+          dokku_log_verbose_quiet "Renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
          "$DOCKER_BIN" rename "$NAME" "$CONTAINER_DATE_NAME" >/dev/null 2>&1 || dokku_log_warn "Unable to rename container"
        fi
      done
@@ -54,7 +55,7 @@ scheduler-docker-local-core-post-deploy() {
    local ID=$(cat "$container")
    local CURRENT_NAME=$("$DOCKER_BIN" inspect -f '{{.Name}}' "$ID" | tr -d /)
    if [[ -n "$CURRENT_NAME" ]]; then
-      dokku_log_info2_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
+      dokku_log_verbose_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
      "$DOCKER_BIN" rename "$CURRENT_NAME" "$NAME" >/dev/null
    fi
  done
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -173,7 +173,7 @@ scheduler-docker-local-scheduler-deploy() {
    dokku_log_info1 "Shutting down old containers in $WAIT seconds"
    local oldid
    for oldid in $oldids; do
-      dokku_log_info2 "$oldid"
+      dokku_log_verbose_quiet "$oldid"
      fn-scheduler-docker-local-register-retired-container "$APP" "$oldid" "$WAIT"
    done
    (
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -13,7 +13,7 @@ scheduler-docker-local-scheduler-inspect() {
    return
  fi

-  local TMP_INSPECT_CMD=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  local TMP_INSPECT_CMD=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TMP_INSPECT_CMD' >/dev/null" RETURN INT TERM EXIT
  cat >"$TMP_INSPECT_CMD" <<EOF
 import json
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/ssh-keys/functions
+++ b/plugins/ssh-keys/functions
@@ -15,7 +15,7 @@ verify_ssh_key_file() {
  [[ -s ${DOKKU_ROOT}/.ssh/authorized_keys ]] || dokku_log_fail "No public keys found."
  local key line=0
  local TMP_KEY_FILE
-  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT

  while read -r key; do
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -10,7 +10,7 @@ add_keys() {
  [[ "$1" == "$cmd" ]] && shift 1
  declare NAME="$1" KEY_FILE="$2"
  local TMP_KEY_FILE
-  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  TMP_KEY_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT

  if [[ -n "$KEY_FILE" ]]; then
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/tar/functions
+++ b/plugins/tar/functions
@@ -11,7 +11,7 @@ tar_build() {
  shift 1

  # clean up after ourselves
-  local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX")
+  local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
  trap "rm -rf '$TAR_BUILD_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT

  # extract tar file
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.18.0"
+version = "0.18.2"
 [plugin.config]
--- a/rpm.mk
+++ b/rpm.mk
@@ -2,12 +2,11 @@ RPM_ARCHITECTURE = x86_64
 DOKKU_RPM_PACKAGE_NAME = dokku-$(DOKKU_VERSION)-1.$(RPM_ARCHITECTURE).rpm
 DOKKU_UPDATE_RPM_PACKAGE_NAME = dokku-update-$(DOKKU_UPDATE_VERSION)-1.$(RPM_ARCHITECTURE).rpm
 HEROKUISH_RPM_PACKAGE_NAME = herokuish-$(HEROKUISH_VERSION)-1.$(RPM_ARCHITECTURE).rpm
-SSHCOMMAND_RPM_PACKAGE_NAME = sshcommand-$(SSHCOMMAND_VERSION)-1.$(RPM_ARCHITECTURE).rpm
 SIGIL_RPM_PACKAGE_NAME = gliderlabs-sigil-$(SIGIL_VERSION)-1.$(RPM_ARCHITECTURE).rpm

 .PHONY: rpm-all

-rpm-all: rpm-setup rpm-herokuish rpm-dokku rpm-sshcommand rpm-sigil rpm-dokku-update
+rpm-all: rpm-setup rpm-herokuish rpm-dokku rpm-sigil rpm-dokku-update
 	mv /tmp/*.rpm .
 	@echo "Done"

@@ -94,29 +93,6 @@ rpm-dokku-update:
 			 contrib/dokku-update=/usr/local/bin/dokku-update \
 			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION

-rpm-sshcommand:
-	rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin
-
-	@echo "-> Downloading package"
-	wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL)
-
-	@echo "-> Copying files into place"
-	mkdir -p "/tmp/build/usr/bin"
-	cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/bin/sshcommand
-	chmod +x /tmp/build/usr/bin/sshcommand
-
-	@echo "-> Creating $(SSHCOMMAND_RPM_PACKAGE_NAME)"
-	sudo fpm -t rpm -s dir -C /tmp/build -n sshcommand \
-			 --version $(SSHCOMMAND_VERSION) \
-			 --architecture $(RPM_ARCHITECTURE) \
-			 --package  $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME) \
-			 --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \
-			 --category admin \
-			 --description "$$SSHCOMMAND_DESCRIPTION" \
-			 --license 'MIT License' \
-			 .
-
 rpm-sigil:
 	rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SIGIL_RPM_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin
--- a/rpm/dokku.postinst
+++ b/rpm/dokku.postinst
@@ -5,11 +5,10 @@ set -eo pipefail; [[ $TRACE ]] && set -x
 setup-user() {
  echo "Setting up dokku user"
  getent passwd dokku >/dev/null || useradd -m -s /bin/bash dokku
-  mkdir -p "$DOKKU_ROOT/.ssh"
-  touch "$DOKKU_ROOT/.ssh/authorized_keys"
-  chown -R dokku:dokku "$DOKKU_ROOT/.ssh"
  usermod -aG docker dokku
-  mkdir -p "$DOKKU_ROOT/.dokkurc"
+  mkdir -p "$DOKKU_ROOT/.ssh" "$DOKKU_ROOT/.dokkurc"
+  touch "$DOKKU_ROOT/.ssh/authorized_keys"
+  chown -R dokku:dokku "$DOKKU_ROOT/.ssh" "${DOKKU_ROOT}/.dokkurc"
 }

 setup-storage() {
@@ -25,6 +24,17 @@ setup-plugins() {
  mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/enabled" "${DOKKU_LIB_ROOT}/plugins/enabled"
  touch "${DOKKU_LIB_ROOT}/core-plugins/config.toml" "${DOKKU_LIB_ROOT}/plugins/config.toml"

+  echo "Migrating old plugins"
+  find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
+      continue
+    elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
+      rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
+    elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+      mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
+    fi
+  done
+
  echo "Enabling all core plugins"
  find "${DOKKU_LIB_ROOT}/core-plugins/available" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
    if [ ! -d "${DOKKU_LIB_ROOT}/plugins/available/$plugin" ]; then
@@ -42,12 +52,11 @@ setup-plugins() {

 setup-sshcommand() {
  echo "Ensure proper sshcommand path"
-  echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand"
-}
-
-setup-version() {
-  rm -f "${DOKKU_ROOT}/VERSION"
-  cp "${DOKKU_LIB_ROOT}/STABLE_VERSION" "${DOKKU_ROOT}/VERSION"
+  echo '/usr/bin/dokku' >"${DOKKU_ROOT}/.sshcommand"
+  if [[ -f .ssh/authorized_keys ]]; then
+    sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
+    rm "${DOKKU_ROOT}/.ssh/authorized_keys"
+  fi
 }

 main() {
@@ -63,7 +72,6 @@ main() {
  setup-storage
  setup-plugins
  setup-sshcommand
-  setup-version
 }

 main
--- a/tests/bats-exec-test-single
+++ b/tests/bats-exec-test-single
@@ -43,7 +43,7 @@ main() {
    exit 1
  fi

-  TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
+  TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXXXX")
  trap 'rm -rf "$TMP_OUTPUT" >/dev/null' RETURN INT TERM EXIT

  eval "$(grep "export BATS_TEST_PATTERN" </usr/local/libexec/bats-core/bats)"
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -15,7 +15,7 @@ install_dependencies() {
  PLUGN_PACKAGE_NAME="plugn_${PLUGN_VERSION}_amd64.deb"
  curl -L "https://packagecloud.io/dokku/dokku/packages/ubuntu/trusty/plugn_${PLUGN_VERSION}_amd64.deb/download.deb" -o "$ROOT_DIR/build/${PLUGN_PACKAGE_NAME}"

-  SSHCOMMAND_VERSION=$(grep SSHCOMMAND_VERSION "${ROOT_DIR}/deb.mk" | head -n1 | cut -d' ' -f3)
+  SSHCOMMAND_VERSION=$(grep SSHCOMMAND_VERSION "${ROOT_DIR}/Makefile" | head -n1 | cut -d' ' -f3)
  SSHCOMMAND_PACKAGE_NAME="sshcommand_${SSHCOMMAND_VERSION}_amd64.deb"
  curl -L "https://packagecloud.io/dokku/dokku/packages/ubuntu/trusty/sshcommand_${SSHCOMMAND_VERSION}_amd64.deb/download.deb" -o "$ROOT_DIR/build/${SSHCOMMAND_PACKAGE_NAME}"
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	950b7ed6be	Release 0.18.2 # History ## 0.18.2 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.18.2/bootstrap.sh sudo DOKKU_TAG=v0.18.2 bash bootstrap.sh ``` ### New Features - #3645: @josegonzalez Use version in DOKKU_LIB_ROOT - #3644: @josegonzalez Refactor temp file handling - #3643: @josegonzalez Quiet deploy output - #3641: @josegonzalez Pass SOURCECODE_WORK_DIR to build-buildpack triggers - #3639: @josegonzalez Refer to upstream sshcommand package ### Documentation - #3642: @josegonzalez Correct issue with label change in docs - #3640: @josegonzalez Add missing popd to post-extract example	2019-08-13 13:57:56 -04:00
Jose Diaz-Gonzalez	9432cdd37c	fix: remove the build-env plugin from rpm installs Closes #3646	2019-08-13 13:57:19 -04:00
Jose Diaz-Gonzalez	5bd499a9bc	Merge pull request #3645 from dokku/version-outside-dokku-root Use version in DOKKU_LIB_ROOT	2019-08-13 01:59:44 -04:00
Jose Diaz-Gonzalez	5506c9e27d	refactor: use version in DOKKU_LIB_ROOT The version in DOKKU_ROOT may be incorrect for docker-based installs if that directory is mounted from an external volume. Instead, pull it from the DOKKU_LIB_ROOT directory, and respect the STABLE_VERSION if specified (VERSION will be the entire version, including commit sha).	2019-08-13 00:53:49 -04:00
Jose Diaz-Gonzalez	e07703645e	Merge pull request #3644 from dokku/tmp-files Refactor temp file handling	2019-08-12 19:27:24 -04:00
Jose Diaz-Gonzalez	3ca6245b00	fix: use 6 X to support running under busybox mktemp from busybox requires that all templates end with XXXXXX.	2019-08-12 18:16:16 -04:00
Jose Diaz-Gonzalez	925c6c4c28	feat: inject the dokku PID into temporary files/directories This will allow background processes to cleanup these files if they were unable to be cleaned up during a run of the dokku binary, as is the case for files copied by the docker binary when running in docker.	2019-08-12 17:56:17 -04:00
Jose Diaz-Gonzalez	0588b6f161	refactor: directly use a tmp file for app.json	2019-08-12 17:53:15 -04:00
Jose Diaz-Gonzalez	fee2d50148	Merge pull request #3643 from dokku/quieter-deploys Quiet deploy output	2019-08-12 17:40:10 -04:00
Jose Diaz-Gonzalez	9a2c8e04a5	feat: quiet down deploys	2019-08-12 17:39:01 -04:00
Jose Diaz-Gonzalez	2517d392a4	Merge pull request #3642 from dokku/fix-label-docs Correct issue with label change in docs	2019-08-12 16:20:50 -04:00
Jose Diaz-Gonzalez	a0b6663bef	docs: correct issue with label change in docs [ci skip]	2019-08-12 16:20:22 -04:00
Jose Diaz-Gonzalez	5fb7b0a74c	Merge pull request #3641 from dokku/pass-sourcecode-work-dir Pass SOURCECODE_WORK_DIR to build-buildpack triggers	2019-08-12 16:14:51 -04:00
Jose Diaz-Gonzalez	026d04a65f	feat: pass SOURCECODE_WORK_DIR to build-buildpack triggers This will allow those triggers to insert and extract files from the sourcecode work directory. Note that changes are not committed to this directory, nor will they be reflected in the committed codebase.	2019-08-12 16:08:31 -04:00
Jose Diaz-Gonzalez	94ace70626	Merge pull request #3639 from dokku/upgrade-sshcommand Refer to upstream sshcommand package	2019-08-12 11:11:33 -04:00
Jose Diaz-Gonzalez	2d36dc2a04	Merge pull request #3640 from dokku/josegonzalez-patch-1 Add missing popd to post-extract example	2019-08-12 11:11:18 -04:00
Jose Diaz-Gonzalez	f3819a46e9	docs: add missing popd to post-extract example [ci skip]	2019-08-12 11:10:54 -04:00
Jose Diaz-Gonzalez	c66e08041a	refactor: refer to upstream sshcommand package sshcommand now packages itself.	2019-08-10 19:55:21 -04:00
Jose Diaz-Gonzalez	9e9f601690	Release 0.18.1 # History ## 0.18.1 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.18.1/bootstrap.sh sudo DOKKU_TAG=v0.18.1 bash bootstrap.sh ``` ### New Features - #3636: @josegonzalez Unify deb and rpm creation code - #3635: @josegonzalez Upgrade herokuish to 0.5.2	2019-08-10 14:32:13 -04:00
Jose Diaz-Gonzalez	c9bc4f8615	Merge pull request #3636 from dokku/refactor-deb-install Unify deb and rpm creation code	2019-08-10 14:29:29 -04:00
Jose Diaz-Gonzalez	34ee8e7079	Merge pull request #3635 from dokku/upgrade-herokuish Upgrade herokuish to 0.5.2	2019-08-08 15:52:48 -04:00
Jose Diaz-Gonzalez	4ab30b8c14	chore: unify deb and rpm creation code - split things into functions - port code that handled postinst on deb to rpm and vice-versa	2019-08-08 15:18:00 -04:00
Jose Diaz-Gonzalez	3bc6f071cf	feat: upgrade herokuish to 0.5.2	2019-08-08 14:53:50 -04:00
Jose Diaz-Gonzalez	0669121242	fix: correct minor issues in docker install docs	2019-08-07 11:53:18 -04:00