Compare commits
4 commits
690aa75546
...
ada27759de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ada27759de | ||
|
|
2648c401f4 | ||
| b09463b162 | |||
|
|
bf3d16e8b3 |
2 changed files with 17 additions and 2 deletions
|
|
@ -16,7 +16,7 @@
|
||||||
# Environment:
|
# Environment:
|
||||||
# REPO_ROOT — absolute path to repo root (defaults to parent of
|
# REPO_ROOT — absolute path to repo root (defaults to parent of
|
||||||
# this script's parent directory)
|
# 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_<JOBNAME> — per-job timeout override (e.g.,
|
# JOB_READY_TIMEOUT_<JOBNAME> — per-job timeout override (e.g.,
|
||||||
# JOB_READY_TIMEOUT_FORGEJO=300)
|
# JOB_READY_TIMEOUT_FORGEJO=300)
|
||||||
#
|
#
|
||||||
|
|
@ -33,7 +33,7 @@ set -euo pipefail
|
||||||
# ── Configuration ────────────────────────────────────────────────────────────
|
# ── Configuration ────────────────────────────────────────────────────────────
|
||||||
SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
REPO_ROOT="${REPO_ROOT:-$(cd "${SCRIPT_ROOT}/../../.." && 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
|
DRY_RUN=0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -225,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 {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue