From bc1aba6c7a12d7d1d95e238a91efabe953cc9679 Mon Sep 17 00:00:00 2001 From: TheDoctor Date: Thu, 25 Nov 2021 18:34:46 +1100 Subject: [PATCH] Use exported environment vars during pack build Config was exported, but the result never used. --- plugins/builder-pack/builder-build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index 7a9644d14..bf84252d7 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -31,11 +31,12 @@ trigger-builder-pack-builder-build() { local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX") trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM - config_export app "$APP" --format envfile --merged >"$TMP_FILE" + config_export app "$APP" --format pretty --merged >"$TMP_FILE" + sed -i 's/:\s*/=/' "$TMP_FILE" plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR" - pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web + pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web --env-file "$TMP_FILE" docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"