From 7f213beefa6e68a897bd9355e128e46738738f56 Mon Sep 17 00:00:00 2001 From: TheDoctor Date: Mon, 29 Nov 2021 13:50:19 +1100 Subject: [PATCH] Mirror env behaviour from herokuish builder, adapt to pack Docker accepts its flags as --env=FOO but pack requires --env FOO, which is why ENV_ARGS_VALUES is iterated into ENV_ARGS, then pack run through eval --- plugins/builder-pack/builder-build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index bf84252d7..39a21088e 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -28,15 +28,17 @@ trigger-builder-pack-builder-build() { pushd "$SOURCECODE_WORK_DIR" &>/dev/null - local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX") - trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM + ENV_ARGS_VALUES="$(config_export app "$APP" --format envfile --merged)" - config_export app "$APP" --format pretty --merged >"$TMP_FILE" - sed -i 's/:\s*/=/' "$TMP_FILE" + while IFS= read -r line; do + ENV_ARGS="$ENV_ARGS--env ${line%=*} " + done <<< "$ENV_ARGS_VALUES" + + eval "$(config_export app "$APP" --merged)" plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR" - pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web --env-file "$TMP_FILE" + eval "pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "$ENV_ARGS"" 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"