Merge pull request #3527 from dokku/report-dokku-image

Use DOKKU_IMAGE for report command
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2019-05-06 11:31:34 -04:00
commit 06d0b07f36
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -36,7 +36,7 @@ DOKKU_DISTRO=$(
echo "$ID" echo "$ID"
) )
export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"} export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest"}
export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"} export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"} export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
+1 -1
View File
@@ -17,7 +17,7 @@ dokku_report_cmd() {
docker -D info | sed "s/^/ /" docker -D info | sed "s/^/ /"
dokku_log_info1 "sigil version: $(sigil -v)" dokku_log_info1 "sigil version: $(sigil -v)"
dokku_log_info1 "herokuish version: " 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 version: $(dokku version)"
dokku_log_info1 "dokku plugins: " dokku_log_info1 "dokku plugins: "
dokku plugin:list | sed "s/^/ /" dokku plugin:list | sed "s/^/ /"