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

fix: respect pre-existing .env files when preparing the herokuish buildenv

Browse Source 
Closes #4894
This commit is contained in:
Jose Diaz-Gonzalez
2022-01-18 02:20:57 -05:00
parent 3c68114ad3
commit 07f2ef1411
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/builder-herokuish/pre-build-buildpack
View File

@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
trigger-builder-herokuish-pre-build-buildpack() {
declare desc="builder-herokuish pre-build-buildpack plugin trigger"
declare trigger="pre-build-buildpack"
declare APP="$1"
declare APP="$1" SOURCECODE_WORK_DIR="$2"
local IMAGE TMP_WORK_DIR
local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP"
@@ -27,7 +27,13 @@ trigger-builder-herokuish-pre-build-buildpack() {
config_bundle --merged "$APP" | tar -x -C "$TMP_WORK_DIR/.env.d"
# create build env for 'old style' buildpacks and dokku plugins
config_export app "$APP" --format envfile --merged >"$TMP_WORK_DIR/.env"
touch "$TMP_WORK_DIR/.env"
if [[ -f "$SOURCECODE_WORK_DIR/.env" ]]; then
cp -f "$SOURCECODE_WORK_DIR/.env" "$TMP_WORK_DIR/.env"
fi
local dotenv_contents="$(sed -Ez '$ s/\n+$//' "$TMP_WORK_DIR/.env")"
echo "$dotenv_contents" >"$TMP_WORK_DIR/.env"
config_export app "$APP" --format envfile --merged >>"$TMP_WORK_DIR/.env"
if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/pre-build.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
dokku_log_warn "Failure injecting BUILD_ENV into build environment"