diff --git a/plugins/builder-herokuish/builder-release b/plugins/builder-herokuish/builder-release index 525ee9a20..9869dd5d2 100755 --- a/plugins/builder-herokuish/builder-release +++ b/plugins/builder-herokuish/builder-release @@ -22,11 +22,11 @@ trigger-builder-herokuish-builder-release() { TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")" trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT - config_export global>"$TMP_WORK_DIR/00-global-env.sh" - config_export app "$APP">"$TMP_WORK_DIR/01-app-env.sh" + config_export global >"$TMP_WORK_DIR/00-global-env.sh" + config_export app "$APP" >"$TMP_WORK_DIR/01-app-env.sh" if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then - dokku_log_warn "Failure injecting environment variables" + dokku_log_warn "Failure injecting environment variables" return 1 fi diff --git a/plugins/builder-herokuish/pre-build-buildpack b/plugins/builder-herokuish/pre-build-buildpack index cc42de190..72e17f62e 100755 --- a/plugins/builder-herokuish/pre-build-buildpack +++ b/plugins/builder-herokuish/pre-build-buildpack @@ -27,7 +27,7 @@ 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" + 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"