From c18af09f5207deb7094f3fd81d16d5ce8b6f9fa0 Mon Sep 17 00:00:00 2001 From: kurt Date: Sat, 2 Sep 2023 23:11:53 -0600 Subject: [PATCH 1/2] use app name instead of test --- plugins/builder-herokuish/builder-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build index a275bc0d14a..1e3c755251d 100755 --- a/plugins/builder-herokuish/builder-build +++ b/plugins/builder-herokuish/builder-build @@ -6,7 +6,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions" fn-builder-herokuish-ensure-cache() { declare APP="$1" - existing_cache="$("$DOCKER_BIN" volume ls --quiet --filter label=com.dokku.app-name=test --filter label=com.dokku.builder-type=herokuish)" + existing_cache="$("$DOCKER_BIN" volume ls --quiet --filter label=com.dokku.app-name="$APP" --filter label=com.dokku.builder-type=herokuish)" if [[ "$existing_cache" != "cache-$APP" ]]; then "$DOCKER_BIN" volume rm "cache-$APP" &>/dev/null || true "$DOCKER_BIN" volume create "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.app-name=$APP" "--label=com.dokku.builder-type=herokuish" "cache-$APP" >/dev/null From fc59b398747f4397cd72436fb598532c6f4b07da Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 5 Sep 2023 20:45:01 -0400 Subject: [PATCH 2/2] chore: use quote around entire argument --- plugins/builder-herokuish/builder-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build index 1e3c755251d..2f8ad251631 100755 --- a/plugins/builder-herokuish/builder-build +++ b/plugins/builder-herokuish/builder-build @@ -6,7 +6,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions" fn-builder-herokuish-ensure-cache() { declare APP="$1" - existing_cache="$("$DOCKER_BIN" volume ls --quiet --filter label=com.dokku.app-name="$APP" --filter label=com.dokku.builder-type=herokuish)" + existing_cache="$("$DOCKER_BIN" volume ls --quiet --filter "label=com.dokku.app-name=$APP" --filter label=com.dokku.builder-type=herokuish)" if [[ "$existing_cache" != "cache-$APP" ]]; then "$DOCKER_BIN" volume rm "cache-$APP" &>/dev/null || true "$DOCKER_BIN" volume create "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.app-name=$APP" "--label=com.dokku.builder-type=herokuish" "cache-$APP" >/dev/null