From 135f2e10fe4f8228ed518f2ea89b06d8facc3546 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Tue, 30 Aug 2022 11:45:12 -0400 Subject: [PATCH] switch key format --- builder-build | 11 +++-------- internal-functions | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/builder-build b/builder-build index da1f33c..f155d42 100755 --- a/builder-build +++ b/builder-build @@ -33,17 +33,12 @@ trigger-builder-nixpacks-builder-build() { for flag in $NIXPACKS_FLAGS ; do local value="$(fn-plugin-property-get "builder-nixpacks" "$APP" "$flag")" if [[ -n "$value" ]] ; then - NIXPACKS_ARGS="${NIXPACKS_ARGS}${flag}='${value}' " + NIXPACKS_ARGS="${NIXPACKS_ARGS}--${flag}=${value// /\\ } " fi done - if [[ -n "$NIXPACKS_ARGS" ]] ; then - dokku_info_log2_quiet "nixpacks build . --name $IMAGE --env $NIXPACKS_ARGS" - nixpacks build . --name "$IMAGE" --env "$NIXPACKS_ARGS" - else - dokku_info_log2_quiet "nixpacks build . --name $IMAGE" - nixpacks build . --name "$IMAGE" - fi + dokku_log_info1_quiet "nixpacks build . --name $IMAGE $NIXPACKS_ARGS" + nixpacks build . --name "$IMAGE" $NIXPACKS_ARGS docker-image-labeler --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE" plugn trigger post-build-nixpacks "$APP" "$SOURCECODE_WORK_DIR" diff --git a/internal-functions b/internal-functions index 13759b4..ba9341a 100755 --- a/internal-functions +++ b/internal-functions @@ -41,5 +41,5 @@ cmd-builder-nixpacks-report-single() { } fn-builder-nixpacks-valid-keys() { - echo "NIXPACKS_APT_PKGS NIXPACKS_BUILD_CACHE_DIRS NIXPACKS_BUILD_CMD NIXPACKS_INSTALL_CACHE_DIRS NIXPACKS_INSTALL_CMD NIXPACKS_LIBS NIXPACKS_NO_CACHE NIXPACKS_NO_MUSL NIXPACKS_PKGS NIXPACKS_START_CMD" + echo "build-cmd cache-key env install-cmd libs pkgs start-cmd" }