Merge pull request #4889 from dokku/arm-detect

Skip herokuish version in report output and disable the herokuish builder on armhf architectures
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2021-10-28 10:35:18 -04:00
commit 74d230c11c
2 files changed
+8

No files matched your search

@@ -23,7 +23,11 @@ cmd-report() {
dokku_log_info1 "git version: $(git --version)" dokku_log_info1 "git version: $(git --version)"
dokku_log_info1 "sigil version: $(sigil -v)" dokku_log_info1 "sigil version: $(sigil -v)"
dokku_log_info1 "herokuish version: " dokku_log_info1 "herokuish version: "
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/^/ /" "$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 "dokku version: $(dokku_version)"
dokku_log_info1 "plugn version: $(plugn version)" dokku_log_info1 "plugn version: $(plugn version)"
dokku_log_info1 "dokku plugins: " dokku_log_info1 "dokku plugins: "
+4
View File
@@ -8,6 +8,10 @@ trigger-builder-herokuish-builder-detect() {
declare trigger="builder-detect" declare trigger="builder-detect"
declare APP="$1" SOURCECODE_WORK_DIR="$2" 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 if fn-has-buildpacks-file "$SOURCECODE_WORK_DIR"; then
echo "herokuish" echo "herokuish"
return return