From ae8eaa7e63e88c9f05569265c6ce39dc58c16176 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 15 Nov 2025 22:59:49 -0500 Subject: [PATCH] refactor: filter out procfile first and include --no-cache in DOCKER_ARGS --- plugins/builder-nixpacks/builder-build | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/builder-nixpacks/builder-build b/plugins/builder-nixpacks/builder-build index d2eede6a3..d1ab7340e 100755 --- a/plugins/builder-nixpacks/builder-build +++ b/plugins/builder-nixpacks/builder-build @@ -27,15 +27,16 @@ trigger-builder-nixpacks-builder-build() { plugn trigger pre-build "$BUILDER_TYPE" "$APP" "$SOURCECODE_WORK_DIR" - no_cache="$(fn-builder-nixpacks-computed-no-cache "$APP")" - NIXPACKS_ARGS="" - if [[ "$no_cache" == "true" ]]; then - NIXPACKS_ARGS="$NIXPACKS_ARGS --no-cache" + if [[ -f "$SOURCECODE_WORK_DIR/Procfile" ]]; then + if procfile-util exists --process-type release; then + procfile-util delete --process-type release + fi fi local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE") DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE") DOCKER_ARGS+=" $DOKKU_GLOBAL_BUILD_ARGS" + [[ "$(fn-builder-nixpacks-computed-no-cache "$APP")" == "true" ]] && DOCKER_ARGS+=" --no-cache" DOCKER_ARGS=" $DOCKER_ARGS " eval set -- "$DOCKER_ARGS" @@ -165,12 +166,6 @@ trigger-builder-nixpacks-builder-build() { eval "$(config_export app "$APP" --merged)" - if [[ -f "$SOURCECODE_WORK_DIR/Procfile" ]]; then - if procfile-util exists --process-type release; then - procfile-util delete --process-type release - fi - fi - # shellcheck disable=SC2086 if ! nixpacks build "${DOCKER_BUILD_LABEL_ARGS[@]}" "${NIXPACKS_ARGS[@]}" --name "$IMAGE" "$SOURCECODE_WORK_DIR"; then dokku_log_warn "Failure building image"