From 2648c401f45295c3f33a006f8e14e02da849c1e5 Mon Sep 17 00:00:00 2001
From: dev-qwen2 <dev-qwen2@disinto.local>
Date: Sun, 19 Apr 2026 09:31:02 +0000
Subject: [PATCH 1/2] fix: [nomad-step-5] edge caddy task fails to clone
 Forgejo from 127.0.0.1:3000 under bridge network (#1034)

---
 nomad/jobs/edge.hcl | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nomad/jobs/edge.hcl b/nomad/jobs/edge.hcl
index 4a495d9..b1b2da4 100644
--- a/nomad/jobs/edge.hcl
+++ b/nomad/jobs/edge.hcl
@@ -123,6 +123,19 @@ job "edge" {
       # ── Caddyfile via Nomad service discovery (S5-fix-7, issue #1018) ────
       # Renders staging upstream from Nomad service registration instead of
       # hardcoded staging:80. Caddy picks up /local/Caddyfile via entrypoint.
+      # Forge URL via Nomad service discovery (issue #1034) — resolves forgejo
+      # service address/port dynamically for bridge network compatibility.
+      template {
+        destination = "local/forge.env"
+        env         = true
+        change_mode = "restart"
+        data        = <<EOT
+{{ range service "forgejo" -}}
+FORGE_URL=http://{{ .Address }}:{{ .Port }}
+{{- end }}
+EOT
+      }
+
       template {
         destination = "local/Caddyfile"
         change_mode = "restart"
@@ -174,7 +187,6 @@ EOT
 
       # ── Non-secret env ───────────────────────────────────────────────────
       env {
-        FORGE_URL         = "http://127.0.0.1:3000"
         FORGE_REPO        = "disinto-admin/disinto"
         DISINTO_CONTAINER = "1"
         PROJECT_NAME      = "disinto"
@@ -233,7 +245,6 @@ EOT
       # ── Non-secret env ───────────────────────────────────────────────────
       env {
         DISPATCHER_BACKEND   = "nomad"
-        FORGE_URL            = "http://127.0.0.1:3000"
         FORGE_REPO           = "disinto-admin/disinto"
         FORGE_OPS_REPO       = "disinto-admin/disinto-ops"
         PRIMARY_BRANCH       = "main"
-- 
2.49.1


From ada27759ded12b97275c04db0a11bfb6df811795 Mon Sep 17 00:00:00 2001
From: dev-qwen2 <dev-qwen2@disinto.local>
Date: Sun, 19 Apr 2026 09:45:02 +0000
Subject: [PATCH 2/2] fix: [nomad-step-5] edge caddy task fails to clone
 Forgejo from 127.0.0.1:3000 under bridge network (#1034)

---
 nomad/jobs/edge.hcl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nomad/jobs/edge.hcl b/nomad/jobs/edge.hcl
index b1b2da4..f44176a 100644
--- a/nomad/jobs/edge.hcl
+++ b/nomad/jobs/edge.hcl
@@ -225,6 +225,21 @@ EOT
         read_only   = false
       }
 
+      # ── Forge URL via Nomad service discovery (issue #1034) ──────────
+      # Resolves forgejo service address/port dynamically for bridge network
+      # compatibility. Template-scoped to dispatcher task (Nomad doesn't
+      # propagate templates across tasks).
+      template {
+        destination = "local/forge.env"
+        env         = true
+        change_mode = "restart"
+        data        = <<EOT
+{{ range service "forgejo" -}}
+FORGE_URL=http://{{ .Address }}:{{ .Port }}
+{{- end }}
+EOT
+      }
+
       # ── Vault-templated secrets (S5.1, issue #988) ──────────────────────
       # Renders FORGE_TOKEN from Vault KV v2 for ops repo access.
       template {
-- 
2.49.1