johba/disinto
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: disinto init: project TOML uses localhost forge_url, breaks agents container (#782)' (#794) from fix/issue-782 into main

Browse source
This commit is contained in:
johba 2026-03-27 17:40:17 +01:00
commit 779584be2d
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.woodpecker/agent-smoke.sh
View file

@ -21,10 +21,11 @@ FAILED=0
# Uses awk instead of grep -Eo for busybox/Alpine compatibility (#296). # Uses awk instead of grep -Eo for busybox/Alpine compatibility (#296).
get_fns() { get_fns() {
local f="$1" local f="$1"
# BRE mode (no -E): () is literal in BRE, avoiding BusyBox ERE bugs # BRE mode (no -E). Use [(][)] for literal parens — unambiguous across
# where \(\) is misinterpreted. BRE one-or-more via [X][X]* instead of +. # GNU grep and BusyBox grep (some BusyBox builds treat bare () as grouping
grep '^[[:space:]]*[a-zA-Z_][a-zA-Z0-9_][a-zA-Z0-9_]*[[:space:]]*()' "$f" 2>/dev/null \ # even in BRE). BRE one-or-more via [X][X]* instead of +.
| sed 's/^[[:space:]]*//; s/[[:space:]]*().*$//' \ grep '^[[:space:]]*[a-zA-Z_][a-zA-Z0-9_][a-zA-Z0-9_]*[[:space:]]*[(][)]' "$f" 2>/dev/null \
| sed 's/^[[:space:]]*//; s/[[:space:]]*[(][)].*$//' \
| sort -u || true | sort -u || true
} }

10
lib/load-project.sh
View file

@ -80,9 +80,17 @@ if mirrors:
return 1 2>/dev/null || exit 1 return 1 2>/dev/null || exit 1
} }
# Export parsed variables # Export parsed variables.
# Inside the agents container (DISINTO_CONTAINER=1), compose already sets the
# correct FORGE_URL (http://forgejo:3000) and path vars for the container
# environment. The TOML carries host-perspective values (localhost, /home/johba/…)
# that would break container API calls and path resolution. Skip overriding
# any env var that is already set when running inside the container.
while IFS='=' read -r _key _val; do while IFS='=' read -r _key _val; do
[ -z "$_key" ] && continue [ -z "$_key" ] && continue
if [ "${DISINTO_CONTAINER:-}" = "1" ] && [ -n "${!_key:-}" ]; then
continue
fi
export "$_key=$_val" export "$_key=$_val"
done <<< "$_PROJECT_VARS" done <<< "$_PROJECT_VARS"