Merge branch 'master' into feature-run-env

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/subcommands/report

@@ -17,7 +17,7 @@ dokku_report_cmd() {
   docker -D info | sed "s/^/       /"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
-  docker run --rm gliderlabs/herokuish:latest herokuish version | sed "s/^/       /"
+  docker run --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/       /"
   dokku_log_info1 "dokku version: $(dokku version)"
   dokku_log_info1 "dokku plugins: "
   dokku plugin:list | sed "s/^/       /"

plugins/00_dokku-standard/subcommands/trace

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-dokku_trace_cmd() {
-  declare desc="enables/disables DOKKU_TRACE"
-  local cmd="trace"
-  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
-  [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
-    dokku_log_fail "Valid trace options are [on/off]"
-  }
-
-  if [[ "$2" == "on" ]]; then
-    echo "Enabling dokku trace"
-    echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
-  fi
-
-  if [[ "$2" == "off" ]]; then
-    echo "Disabling dokku trace"
-    rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
-  fi
-}
-
-dokku_trace_cmd "$@"