Compare commits

..

4 commits

Author SHA1 Message Date
dev-qwen2
d8f2be1c4f fix: nomad template whitespace trimming strips newlines between env var blocks (#996)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/nomad-validate Pipeline was successful
ci/woodpecker/pr/secret-scan Pipeline was successful
2026-04-18 10:29:20 +00:00
dev-qwen2
78a19a8add fix: nomad template whitespace trimming strips newlines between env var blocks (#996) 2026-04-18 10:29:20 +00:00
1eac6d63e2 Merge pull request 'fix: [nomad-step-5] S5-fix-1 — chat/edge image build context should be docker/<svc>/ not repo root (#1004)' (#1005) from fix/issue-1004 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
2026-04-18 10:13:56 +00:00
Agent
f2bafbc190 fix: [nomad-step-5] S5-fix-1 — chat/edge image build context should be docker/<svc>/ not repo root (#1004)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/nomad-validate Pipeline was successful
ci/woodpecker/pr/smoke-init Pipeline was successful
2026-04-18 10:02:23 +00:00
3 changed files with 16 additions and 16 deletions

View file

@ -843,10 +843,10 @@ _disinto_init_nomad() {
echo "[build] [dry-run] docker build -t disinto/agents:local -f ${FACTORY_ROOT}/docker/agents/Dockerfile ${FACTORY_ROOT}" echo "[build] [dry-run] docker build -t disinto/agents:local -f ${FACTORY_ROOT}/docker/agents/Dockerfile ${FACTORY_ROOT}"
fi fi
if echo ",$with_services," | grep -q ",chat,"; then if echo ",$with_services," | grep -q ",chat,"; then
echo "[build] [dry-run] docker build -t disinto/chat:local -f ${FACTORY_ROOT}/docker/chat/Dockerfile ${FACTORY_ROOT}" echo "[build] [dry-run] docker build -t disinto/chat:local -f ${FACTORY_ROOT}/docker/chat/Dockerfile ${FACTORY_ROOT}/docker/chat"
fi fi
if echo ",$with_services," | grep -q ",edge,"; then if echo ",$with_services," | grep -q ",edge,"; then
echo "[build] [dry-run] docker build -t disinto/edge:local -f ${FACTORY_ROOT}/docker/edge/Dockerfile ${FACTORY_ROOT}" echo "[build] [dry-run] docker build -t disinto/edge:local -f ${FACTORY_ROOT}/docker/edge/Dockerfile ${FACTORY_ROOT}/docker/edge"
fi fi
fi fi
exit 0 exit 0
@ -950,12 +950,12 @@ _disinto_init_nomad() {
if echo ",$with_services," | grep -q ",chat,"; then if echo ",$with_services," | grep -q ",chat,"; then
local tag="disinto/chat:local" local tag="disinto/chat:local"
echo "── Building $tag ─────────────────────────────" echo "── Building $tag ─────────────────────────────"
docker build -t "$tag" -f "${FACTORY_ROOT}/docker/chat/Dockerfile" "${FACTORY_ROOT}" 2>&1 | tail -5 docker build -t "$tag" -f "${FACTORY_ROOT}/docker/chat/Dockerfile" "${FACTORY_ROOT}/docker/chat" 2>&1 | tail -5
fi fi
if echo ",$with_services," | grep -q ",edge,"; then if echo ",$with_services," | grep -q ",edge,"; then
local tag="disinto/edge:local" local tag="disinto/edge:local"
echo "── Building $tag ─────────────────────────────" echo "── Building $tag ─────────────────────────────"
docker build -t "$tag" -f "${FACTORY_ROOT}/docker/edge/Dockerfile" "${FACTORY_ROOT}" 2>&1 | tail -5 docker build -t "$tag" -f "${FACTORY_ROOT}/docker/edge/Dockerfile" "${FACTORY_ROOT}/docker/edge" 2>&1 | tail -5
fi fi
fi fi

View file

@ -153,43 +153,43 @@ FORGE_TOKEN=seed-me
FORGE_PASS=seed-me FORGE_PASS=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/review" -}} {{ with secret "kv/data/disinto/bots/review" -}}
FORGE_REVIEW_TOKEN={{ .Data.data.token }} FORGE_REVIEW_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_REVIEW_TOKEN=seed-me FORGE_REVIEW_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/gardener" -}} {{ with secret "kv/data/disinto/bots/gardener" -}}
FORGE_GARDENER_TOKEN={{ .Data.data.token }} FORGE_GARDENER_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_GARDENER_TOKEN=seed-me FORGE_GARDENER_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/architect" -}} {{ with secret "kv/data/disinto/bots/architect" -}}
FORGE_ARCHITECT_TOKEN={{ .Data.data.token }} FORGE_ARCHITECT_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_ARCHITECT_TOKEN=seed-me FORGE_ARCHITECT_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/planner" -}} {{ with secret "kv/data/disinto/bots/planner" -}}
FORGE_PLANNER_TOKEN={{ .Data.data.token }} FORGE_PLANNER_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_PLANNER_TOKEN=seed-me FORGE_PLANNER_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/predictor" -}} {{ with secret "kv/data/disinto/bots/predictor" -}}
FORGE_PREDICTOR_TOKEN={{ .Data.data.token }} FORGE_PREDICTOR_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_PREDICTOR_TOKEN=seed-me FORGE_PREDICTOR_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/supervisor" -}} {{ with secret "kv/data/disinto/bots/supervisor" -}}
FORGE_SUPERVISOR_TOKEN={{ .Data.data.token }} FORGE_SUPERVISOR_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_SUPERVISOR_TOKEN=seed-me FORGE_SUPERVISOR_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/vault" -}} {{ with secret "kv/data/disinto/bots/vault" -}}
FORGE_VAULT_TOKEN={{ .Data.data.token }} FORGE_VAULT_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_VAULT_TOKEN=seed-me FORGE_VAULT_TOKEN=seed-me

View file

@ -95,31 +95,31 @@ GITHUB_TOKEN={{ .Data.data.value }}
GITHUB_TOKEN= GITHUB_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}} {{ with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}}
CODEBERG_TOKEN={{ .Data.data.value }} CODEBERG_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
CODEBERG_TOKEN= CODEBERG_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}} {{ with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}}
CLAWHUB_TOKEN={{ .Data.data.value }} CLAWHUB_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
CLAWHUB_TOKEN= CLAWHUB_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/DEPLOY_KEY" -}} {{ with secret "kv/data/disinto/runner/DEPLOY_KEY" -}}
DEPLOY_KEY={{ .Data.data.value }} DEPLOY_KEY={{ .Data.data.value }}
{{- else -}} {{- else -}}
DEPLOY_KEY= DEPLOY_KEY=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/NPM_TOKEN" -}} {{ with secret "kv/data/disinto/runner/NPM_TOKEN" -}}
NPM_TOKEN={{ .Data.data.value }} NPM_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
NPM_TOKEN= NPM_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}} {{ with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}}
DOCKER_HUB_TOKEN={{ .Data.data.value }} DOCKER_HUB_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
DOCKER_HUB_TOKEN= DOCKER_HUB_TOKEN=