github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5591 from dokku/josegonzalez-patch-1

Browse Source 
Allow the herokuish builder to be detected when the computed allowed value is set not set to false
This commit is contained in:
josegonzalez
2023-01-15 12:28:30 -05:00
committed by GitHub
parent fa34f89901 7f19f72c0d
commit e22d74febb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/builder-herokuish/builder-detect
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source "$PLUGIN_AVAILABLE_PATH/builder-herokuish/functions" source "$PLUGIN_AVAILABLE_PATH/builder-herokuish/functions"
source "$PLUGIN_AVAILABLE_PATH/builder-herokuish/internal-functions"
set -eo pipefail set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x [[ $DOKKU_TRACE ]] && set -x
@@ -10,7 +11,9 @@ trigger-builder-herokuish-builder-detect() {
local ARCHITECTURE="$(dpkg --print-architecture 2>/dev/null || true)" local ARCHITECTURE="$(dpkg --print-architecture 2>/dev/null || true)"
if [[ "$ARCHITECTURE" == "armhf" ]] || [[ "$ARCHITECTURE" == "arm64" ]]; then if [[ "$ARCHITECTURE" == "armhf" ]] || [[ "$ARCHITECTURE" == "arm64" ]]; then
return if [[ "$(fn-builder-herokuish-computed-allowed "$APP")" != "true" ]]; then
return
fi
fi fi
if fn-has-buildpacks-file "$SOURCECODE_WORK_DIR"; then if fn-has-buildpacks-file "$SOURCECODE_WORK_DIR"; then