mirror of
https://github.com/dokku/dokku.git
synced 2025-12-16 12:07:45 +01:00
fix: pass global build args as array when building nixpacks apps
Refs #8187
This commit is contained in:
@@ -35,7 +35,6 @@ trigger-builder-nixpacks-builder-build() {
|
|||||||
|
|
||||||
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE")
|
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE")
|
||||||
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE")
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE")
|
||||||
DOCKER_ARGS+=" $DOKKU_GLOBAL_BUILD_ARGS"
|
|
||||||
|
|
||||||
DOCKER_ARGS=" $DOCKER_ARGS "
|
DOCKER_ARGS=" $DOCKER_ARGS "
|
||||||
eval set -- "$DOCKER_ARGS"
|
eval set -- "$DOCKER_ARGS"
|
||||||
@@ -244,7 +243,7 @@ trigger-builder-nixpacks-builder-build() {
|
|||||||
eval "$(config_export app "$APP" --merged)"
|
eval "$(config_export app "$APP" --merged)"
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
if ! nixpacks build "${DOCKER_BUILD_LABEL_ARGS[@]}" "${NIXPACKS_ARGS[@]}" --name "$IMAGE" "$SOURCECODE_WORK_DIR"; then
|
if ! nixpacks build "${DOCKER_BUILD_LABEL_ARGS[@]}" "${NIXPACKS_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS --name "$IMAGE" "$SOURCECODE_WORK_DIR"; then
|
||||||
dokku_log_warn "Failure building image"
|
dokku_log_warn "Failure building image"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user