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
This commit is contained in:
1 parent
bc1aba6c7a
commit
7f213beefa
1 file changed
+7
-5
@@ -28,15 +28,17 @@ trigger-builder-pack-builder-build() {
|
|||||||
|
|
||||||
pushd "$SOURCECODE_WORK_DIR" &>/dev/null
|
pushd "$SOURCECODE_WORK_DIR" &>/dev/null
|
||||||
|
|
||||||
local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
ENV_ARGS_VALUES="$(config_export app "$APP" --format envfile --merged)"
|
||||||
trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM
|
|
||||||
|
|
||||||
config_export app "$APP" --format pretty --merged >"$TMP_FILE"
|
while IFS= read -r line; do
|
||||||
sed -i 's/:\s*/=/' "$TMP_FILE"
|
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"
|
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"
|
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"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user