github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: simplify env var passing by using a new config:export format

Browse Source 
Also add a test for env vars during build time for pack-built applications.
This commit is contained in:
Jose Diaz-Gonzalez
2022-01-15 08:34:02 -05:00
parent 7f213beefa
commit 6f55b89149
6 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,18 +28,11 @@ trigger-builder-pack-builder-build() {
pushd "$SOURCECODE_WORK_DIR" &>/dev/null
ENV_ARGS_VALUES="$(config_export app "$APP" --format envfile --merged)"
while IFS= read -r line; do
ENV_ARGS="$ENV_ARGS--env ${line%=*} "
done <<< "$ENV_ARGS_VALUES"
ENV_ARGS=($(config_export app "$APP" --format pack --merged))
eval "$(config_export app "$APP" --merged)"
plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR"
eval "pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "$ENV_ARGS""
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"
plugn trigger post-build-pack "$APP" "$SOURCECODE_WORK_DIR"