From b146483940be94b63ec33e2148f580e19bcae222 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Oct 2021 10:01:36 -0400 Subject: [PATCH] fix: skip herokuish version in report output and disable the herokuish builder on armhf architectures We don't skip pack as in theory they may be able to support arm in the future. Dockerfile builds should work fine, as long as all images in the FROM directives have arm versions. Finally, the null builder _should_ always work, but of course YMMV :D --- plugins/00_dokku-standard/subcommands/report | 6 +++++- plugins/builder-herokuish/builder-detect | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report index 4ce98bfbf..63e769db5 100755 --- a/plugins/00_dokku-standard/subcommands/report +++ b/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: " diff --git a/plugins/builder-herokuish/builder-detect b/plugins/builder-herokuish/builder-detect index 7ee618691..63d291499 100755 --- a/plugins/builder-herokuish/builder-detect +++ b/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