Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mirror env behaviour from herokuish builder, adapt to pack

Browse Source 
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:
TheDoctor
2021-11-29 13:50:19 +11:00
committed by Jose Diaz-Gonzalez
parent bc1aba6c7a
commit 7f213beefa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/builder-pack/builder-build
View File

@@ -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"