build fix
Some checks failed
ci/woodpecker/push/db Pipeline was successful
ci/woodpecker/push/fx/1 Pipeline failed
ci/woodpecker/push/nats Pipeline was successful
ci/woodpecker/push/fx/2 Pipeline failed

This commit is contained in:
Stephan D
2025-11-07 23:04:57 +01:00
parent 0e40af7559
commit 0c0eeb27f8
2 changed files with 37 additions and 9 deletions

View File

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

View File

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