From d82d80cabb5f3db50d76bc63929608d94a618a95 Mon Sep 17 00:00:00 2001
From: johba <johba@disinto>
Date: Sat, 28 Mar 2026 13:58:46 +0000
Subject: [PATCH] fix: preserve FORGE_URL when sourcing .env inside container

source .env clobbers FORGE_URL from http://forgejo:3000 (Docker DNS)
to http://localhost:3000 (unreachable inside container). Save and
restore FORGE_URL around the source.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/env.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/env.sh b/lib/env.sh
index 7f0ad2d..da76346 100755
--- a/lib/env.sh
+++ b/lib/env.sh
@@ -27,14 +27,19 @@ export DISINTO_LOG_DIR
 # by the compose-injected value when running via docker exec.
 if [ -f "$FACTORY_ROOT/.env.enc" ] && command -v sops &>/dev/null; then
   set -a
+  local _saved_forge_url="${FORGE_URL:-}"
   eval "$(sops -d --output-type dotenv "$FACTORY_ROOT/.env.enc" 2>/dev/null)" \
     || echo "Warning: failed to decrypt .env.enc — secrets not loaded" >&2
   set +a
+  [ -n "$_saved_forge_url" ] && export FORGE_URL="$_saved_forge_url"
 elif [ -f "$FACTORY_ROOT/.env" ]; then
+  # Preserve compose-injected FORGE_URL (localhost in .env != forgejo in Docker)
+  local _saved_forge_url="${FORGE_URL:-}"
   set -a
   # shellcheck source=/dev/null
   source "$FACTORY_ROOT/.env"
   set +a
+  [ -n "$_saved_forge_url" ] && export FORGE_URL="$_saved_forge_url"
 fi
 
 # PATH: foundry, node, system