From 0c0eeb27f8bcc151f9a41b54931dd33fcfa56bfc Mon Sep 17 00:00:00 2001
From: Stephan D <sdeshevikh@yandex.ru>
Date: Fri, 7 Nov 2025 23:04:57 +0100
Subject: [PATCH] build fix

---
 ci/pipelines/fx/build.sh  | 23 ++++++++++++++++++-----
 ci/pipelines/fx/deploy.sh | 23 +++++++++++++++++++----
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/ci/pipelines/fx/build.sh b/ci/pipelines/fx/build.sh
index d961728..0daa259 100755
--- a/ci/pipelines/fx/build.sh
+++ b/ci/pipelines/fx/build.sh
@@ -9,10 +9,24 @@ sh ci/pipelines/fx/ensure_env_version.sh
 sed -i 's/\r$//' ./ci/prod/.env.runtime
 sed -i 's/\r$//' ./.env.version
 
-set -a
-. ./ci/prod/.env.runtime
-. ./.env.version
-set +a
+lc_load_env_file() {
+  file="$1"
+  while IFS= read -r line || [ -n "$line" ]; do
+    case "$line" in
+      ''|\#*) continue ;;
+    esac
+    key="${line%%=*}"
+    value="${line#*=}"
+    key="$(printf '%s' "$key" | tr -d '[:space:]')"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    value="${value%$'\r'}"
+    export "$key=$value"
+  done <"$file"
+}
+
+lc_load_env_file ./ci/prod/.env.runtime
+lc_load_env_file ./.env.version
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -37,7 +51,6 @@ cat <<EOF >/kaniko/.docker/config.json
 EOF
 
 /kaniko/executor \
-  --context "${PWD}" \
   --dockerfile "${FX_DOCKERFILE}" \
   --destination "${REGISTRY_URL}/${FX_IMAGE_PATH}:${APP_V}" \
   --build-arg APP_VERSION="${APP_V}" \
diff --git a/ci/pipelines/fx/deploy.sh b/ci/pipelines/fx/deploy.sh
index fec4cbc..b1a95d7 100755
--- a/ci/pipelines/fx/deploy.sh
+++ b/ci/pipelines/fx/deploy.sh
@@ -7,11 +7,26 @@ fi
 
 sh ci/pipelines/fx/ensure_env_version.sh
 sed -i 's/\r$//' ./ci/prod/.env.runtime
+sed -i 's/\r$//' ./.env.version
 
-set -a
-. ./ci/prod/.env.runtime
-. ./.env.version
-set +a
+lc_load_env_file() {
+  file="$1"
+  while IFS= read -r line || [ -n "$line" ]; do
+    case "$line" in
+      ''|\#*) continue ;;
+    esac
+    key="${line%%=*}"
+    value="${line#*=}"
+    key="$(printf '%s' "$key" | tr -d '[:space:]')"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    value="${value%$'\r'}"
+    export "$key=$value"
+  done <"$file"
+}
+
+lc_load_env_file ./ci/prod/.env.runtime
+lc_load_env_file ./.env.version
 
 FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
 FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"