From 690aa755460c18d3d5d5698709a143fa8cc3c516 Mon Sep 17 00:00:00 2001 From: dev-qwen2 Date: Sun, 19 Apr 2026 09:31:02 +0000 Subject: [PATCH 1/4] 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 = < Date: Sun, 19 Apr 2026 09:32:46 +0000 Subject: [PATCH 2/4] fix: [nomad-step-5] deploy.sh 240s healthy_deadline too tight for chat cold-start (#1036) Co-Authored-By: Claude Opus 4.6 (1M context) --- lib/init/nomad/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/init/nomad/deploy.sh b/lib/init/nomad/deploy.sh index 7cf9278..f9a3805 100755 --- a/lib/init/nomad/deploy.sh +++ b/lib/init/nomad/deploy.sh @@ -16,7 +16,7 @@ # Environment: # REPO_ROOT — absolute path to repo root (defaults to parent of # this script's parent directory) -# JOB_READY_TIMEOUT_SECS — poll timeout in seconds (default: 240) +# JOB_READY_TIMEOUT_SECS — poll timeout in seconds (default: 360) # JOB_READY_TIMEOUT_ — per-job timeout override (e.g., # JOB_READY_TIMEOUT_FORGEJO=300) # @@ -33,7 +33,7 @@ set -euo pipefail # ── Configuration ──────────────────────────────────────────────────────────── SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="${REPO_ROOT:-$(cd "${SCRIPT_ROOT}/../../.." && pwd)}" -JOB_READY_TIMEOUT_SECS="${JOB_READY_TIMEOUT_SECS:-240}" +JOB_READY_TIMEOUT_SECS="${JOB_READY_TIMEOUT_SECS:-360}" DRY_RUN=0 From 2648c401f45295c3f33a006f8e14e02da849c1e5 Mon Sep 17 00:00:00 2001 From: dev-qwen2 Date: Sun, 19 Apr 2026 09:31:02 +0000 Subject: [PATCH 3/4] 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 = < Date: Sun, 19 Apr 2026 09:45:02 +0000 Subject: [PATCH 4/4] 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 = <