disinto-admin/disinto
1
0
Fork 0
Code Issues 22 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: [nomad-step-5] edge caddy task fails to clone Forgejo from 127.0.0.1:3000 under bridge network (#1034) #1039

Merged
dev-qwen2 merged 2 commits from fix/issue-1034 into main 2026-04-19 09:56:50 +00:00
Conversation 3 Commits 2 Files changed 1 +28 -2
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
nomad/jobs/edge.hcl
View file

@ -123,6 +123,19 @@ job "edge" {
# ── Caddyfile via Nomad service discovery (S5-fix-7, issue #1018) ──── # ── Caddyfile via Nomad service discovery (S5-fix-7, issue #1018) ────
# Renders staging upstream from Nomad service registration instead of # Renders staging upstream from Nomad service registration instead of
# hardcoded staging:80. Caddy picks up /local/Caddyfile via entrypoint. # 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 { template {
destination = "local/Caddyfile" destination = "local/Caddyfile"
change_mode = "restart" change_mode = "restart"
@ -174,7 +187,6 @@ EOT
# ── Non-secret env ─────────────────────────────────────────────────── # ── Non-secret env ───────────────────────────────────────────────────
env { env {
FORGE_URL = "http://127.0.0.1:3000"
FORGE_REPO = "disinto-admin/disinto" FORGE_REPO = "disinto-admin/disinto"
DISINTO_CONTAINER = "1" DISINTO_CONTAINER = "1"
PROJECT_NAME = "disinto" PROJECT_NAME = "disinto"
@ -213,6 +225,21 @@ EOT
read_only = false 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) ────────────────────── # ── Vault-templated secrets (S5.1, issue #988) ──────────────────────
# Renders FORGE_TOKEN from Vault KV v2 for ops repo access. # Renders FORGE_TOKEN from Vault KV v2 for ops repo access.
template { template {
@ -233,7 +260,6 @@ EOT
# ── Non-secret env ─────────────────────────────────────────────────── # ── Non-secret env ───────────────────────────────────────────────────
env { env {
DISPATCHER_BACKEND = "nomad" DISPATCHER_BACKEND = "nomad"
FORGE_URL = "http://127.0.0.1:3000"
FORGE_REPO = "disinto-admin/disinto" FORGE_REPO = "disinto-admin/disinto"
FORGE_OPS_REPO = "disinto-admin/disinto-ops" FORGE_OPS_REPO = "disinto-admin/disinto-ops"
PRIMARY_BRANCH = "main" PRIMARY_BRANCH = "main"