Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6b23a7970 | ||
|
|
150b262db3 | ||
|
|
44babb6a22 | ||
|
|
10c35138db | ||
|
|
162700bb4f | ||
|
|
4af1209565 | ||
|
|
a557d9fb07 | ||
|
|
f696efef11 | ||
|
|
2e889323ef | ||
|
|
b620682a41 | ||
|
|
87a254c902 | ||
|
|
efd8caa218 | ||
|
|
70814970c7 | ||
|
|
32e30f7e8b | ||
|
|
0bc117c868 | ||
|
|
7b5273b4b4 | ||
|
|
9d0e9d9b60 | ||
|
|
08949ba3a4 | ||
|
|
ef4bcfcb25 | ||
|
|
808483181b | ||
|
|
f6fc288aa6 | ||
|
|
701d1289ea |
+13
@@ -2,8 +2,17 @@
|
||||
*.swp
|
||||
*.swo
|
||||
.DS_Store
|
||||
|
||||
# Secrets / stack env files - never commit these.
|
||||
# deploy/global.env and immich.env-example etc. are the intended committed
|
||||
# templates/examples; actual secret-bearing .env files must stay untracked.
|
||||
.env
|
||||
.env.local
|
||||
*.env
|
||||
!*.env-example
|
||||
!deploy/global.env
|
||||
*.env.bak
|
||||
*.env.backup
|
||||
secrets/
|
||||
keys/
|
||||
*.key
|
||||
@@ -15,3 +24,7 @@ keys/
|
||||
# Local overrides
|
||||
docker-compose.override.yml
|
||||
local/
|
||||
|
||||
# Editor/adhoc backups that sometimes get left in the tree
|
||||
*.bak
|
||||
*.bak-*
|
||||
|
||||
+19
-6
@@ -36,6 +36,18 @@ when:
|
||||
# until this was restored. Lesson: grep for the literal string '$${' and
|
||||
# diff the count against the previous version before ever committing a
|
||||
# full-file rewrite of this pipeline.
|
||||
#
|
||||
# 2026-08-26 FIX: FOLDER_STACKS/FOLDERS detection (grep -E '^[^/.][^/]*/')
|
||||
# matches ANY non-dot top-level folder in the changed-files list, including
|
||||
# deploy/ — the shared tooling folder, not a stack. A PR touching only
|
||||
# deploy/envparse.py caused stack-deploy.sh to be invoked with "deploy" as
|
||||
# a stack name, which correctly errored ("No main compose file... in
|
||||
# .../deploy") since deploy/ has no deploy.yaml. No live service was
|
||||
# affected (the error occurs before any redeploy), but it produced a
|
||||
# confusing pipeline failure on an otherwise-correct change. deploy/ is
|
||||
# already unconditionally rsynced at the top of the deploy step regardless
|
||||
# of which stacks changed, so it's safe to exclude it from the stack list
|
||||
# everywhere folders are detected below.
|
||||
# ─────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
steps:
|
||||
@@ -53,8 +65,9 @@ steps:
|
||||
FLAT=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.ya?ml$' || true)
|
||||
|
||||
# Folder: any file under a subfolder (e.g. immich/immich.yml).
|
||||
# Exclude dotfolders (.woodpecker, .git, .gitea, etc.)
|
||||
FOLDERS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | sort -u || true)
|
||||
# Exclude dotfolders (.woodpecker, .git, .gitea, etc.) and deploy/
|
||||
# (shared tooling, not a stack — see note above).
|
||||
FOLDERS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | grep -v '^deploy$' | sort -u || true)
|
||||
|
||||
[ -z "$FLAT" ] && [ -z "$FOLDERS" ] && echo "No stacks changed" && exit 0
|
||||
|
||||
@@ -180,14 +193,14 @@ steps:
|
||||
- |
|
||||
CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
|
||||
FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | sort -u || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | grep -v '^deploy$' | sort -u || true)
|
||||
ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
|
||||
[ -z "$ALL_STACKS" ] && echo "No stacks changed, skipping" && exit 0
|
||||
- scp -o StrictHostKeyChecking=no deploy/create-secrets.sh root@$${SWARM_MANAGER_IP}:/tmp/cs.sh
|
||||
- |
|
||||
CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
|
||||
FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | sort -u || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | grep -v '^deploy$' | sort -u || true)
|
||||
ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
|
||||
|
||||
for STACK in $ALL_STACKS; do
|
||||
@@ -318,7 +331,7 @@ steps:
|
||||
- |
|
||||
CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
|
||||
FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | sort -u || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | grep -v '^deploy$' | sort -u || true)
|
||||
ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
|
||||
[ -z "$ALL_STACKS" ] && echo "No stacks changed" && exit 0
|
||||
|
||||
@@ -372,7 +385,7 @@ steps:
|
||||
- |
|
||||
CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
|
||||
FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | sort -u || true)
|
||||
FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/.][^/]*/' | cut -d/ -f1 | grep -v '^deploy$' | sort -u || true)
|
||||
ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
|
||||
[ -z "$ALL_STACKS" ] && exit 0
|
||||
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
# NOTE: litellm's AWS/DB/master-key secrets, open-webui's secret key/DB URL,
|
||||
# and the OAuth client secret are provisioned into ai/ai.env at deploy time
|
||||
# from Woodpecker secrets (see PRs #4, #6, #7) -- not committed here.
|
||||
# MCPO_API_KEY (used by mcpo and mcpo-critical) is NOT yet migrated; it
|
||||
# remains manually managed in ai/ai.env by design (see PR #4 discussion).
|
||||
services:
|
||||
open-webui:
|
||||
image: ghcr.io/open-webui/open-webui:0.11.1
|
||||
|
||||
+181
-6
@@ -22,7 +22,7 @@ def merge_envs(base_path, override_path):
|
||||
merged = {**base, **override}
|
||||
return list(merged.items())
|
||||
|
||||
# ─────────────────────────────────────────────────────────────────────────────
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
# 2026-08-26 FIX — double-interpolation truncation bug (Pattern B stacks):
|
||||
#
|
||||
# stack-deploy.sh's single-file/no-extras path is:
|
||||
@@ -57,15 +57,179 @@ def merge_envs(base_path, override_path):
|
||||
# one level of escaping ('$$' -> literal '$'), landing on the correct
|
||||
# original single '$' with no leftover variable-reference lookalike.
|
||||
#
|
||||
# Only applied in export/export_merged (which feed `eval` to set the
|
||||
# actual values envsubst reads) — NOT in vars/vars_merged, which just
|
||||
# build envsubst's space-separated $VARNAME allowlist string and have
|
||||
# nothing to do with actual values.
|
||||
# ─────────────────────────────────────────────────────────────────────────────
|
||||
# ONLY applies to the single-file path (no `docker compose config` step
|
||||
# downstream). See export_raw/export_raw_merged below for why the
|
||||
# folder+extras path must NOT use this.
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
|
||||
def escape_dollar(v):
|
||||
return v.replace('$', '$$')
|
||||
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
# 2026-08-26 FIX #2 — SECOND double-interpolation bug, folder+extras path
|
||||
# (discovered fixing IMMICH_KIOSK_BASICAUTH, a bcrypt hash full of '$'):
|
||||
#
|
||||
# The folder+extras render path is:
|
||||
# docker compose <files> config | strip | envsubst "$VARS"
|
||||
# -> docker stack deploy -c -
|
||||
#
|
||||
# `docker compose config` performs its OWN ${VAR} interpolation AND its
|
||||
# own re-escaping of the output: any literal '$' character that ends up
|
||||
# in the rendered YAML — escaped or not — gets doubled to '$$' by
|
||||
# `docker compose config` itself, unconditionally, as part of producing
|
||||
# spec-safe output. Confirmed by isolated test:
|
||||
# raw MYVAR='a$b$c' -> docker compose config -> "a$$b$$c" (correct,
|
||||
# one level added)
|
||||
# escaped MYVAR='a$$b$$c' (i.e. pre-doubled by escape_dollar) ->
|
||||
# docker compose config -> "a$$$$b$$$$c" (WRONG, doubled twice)
|
||||
#
|
||||
# `docker stack deploy -c -` still only removes exactly ONE level of
|
||||
# escaping on its way in (confirmed: "a$$b$$c" -> container label
|
||||
# "a$b$c", correct). So across the whole folder+extras pipeline there is
|
||||
# exactly ONE implicit escaping step (`docker compose config`) and ONE
|
||||
# implicit un-escaping step (`docker stack deploy`) already built in —
|
||||
# pre-escaping the exported value on top of that leaves one extra,
|
||||
# uncollapsed level of '$$' in the final container label/env value.
|
||||
#
|
||||
# Confirmed impact (2026-08-26): IMMICH_KIOSK_BASICAUTH
|
||||
# ("BabyBryan:$2y$05$...") rendered as "BabyBryan:$$2y$$05$$..." in the
|
||||
# final container label — Traefik basic auth would never match the real
|
||||
# password hash, silently locking out the kiosk with no error.
|
||||
#
|
||||
# Fix: use export_raw / export_raw_merged (NO escape_dollar) whenever the
|
||||
# render path goes through `docker compose config` — i.e. any stack with
|
||||
# extension files. Use export / export_merged (WITH escape_dollar) only
|
||||
# for the single-file path, which has no `docker compose config` step and
|
||||
# therefore only Swarm's own interpolation pass to protect against.
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
# 2026-08-26 FIX — depends_on long-form vs Swarm short-form:
|
||||
#
|
||||
# Folder-based stacks with extension files (e.g. immich + hwaccel.*.yml)
|
||||
# go through the `docker compose <files> config | strip | docker stack
|
||||
# deploy -c -` merge path. Modern `docker compose config` normalizes the
|
||||
# short-form list syntax:
|
||||
# depends_on: [database, redis]
|
||||
# into the long-form condition mapping:
|
||||
# depends_on:
|
||||
# database:
|
||||
# condition: service_started
|
||||
# required: true
|
||||
# redis:
|
||||
# condition: service_started
|
||||
# required: true
|
||||
#
|
||||
# `docker stack deploy` (Swarm mode) does NOT understand the long-form
|
||||
# mapping and rejects it with: "services.<svc>.depends_on must be a list".
|
||||
# Single-file stacks (no extras) never hit this because they skip the
|
||||
# `docker compose config` step entirely and go straight through envsubst.
|
||||
#
|
||||
# Fix: collapse any long-form depends_on mapping back into the Swarm-
|
||||
# compatible short-form list, purely as a text transform on the rendered
|
||||
# YAML, right alongside the existing env_file stripping.
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
|
||||
_DEP_RE = re.compile(r'^([ \t]*)depends_on:\s*$')
|
||||
_CHILD_KEY_RE = re.compile(r'^([ \t]*)([\w.\-]+):\s*$')
|
||||
_CHILD_LIST_RE = re.compile(r'^([ \t]*)-\s*(\S+)\s*$')
|
||||
|
||||
def collapse_depends_on(text):
|
||||
lines = text.split('\n')
|
||||
out = []
|
||||
i = 0
|
||||
n = len(lines)
|
||||
while i < n:
|
||||
line = lines[i]
|
||||
m = _DEP_RE.match(line)
|
||||
if not m:
|
||||
out.append(line)
|
||||
i += 1
|
||||
continue
|
||||
|
||||
indent = m.group(1)
|
||||
base_indent = len(indent)
|
||||
out.append(line)
|
||||
i += 1
|
||||
|
||||
services = []
|
||||
parse_ok = True
|
||||
while i < n:
|
||||
l = lines[i]
|
||||
if l.strip() == '':
|
||||
i += 1
|
||||
continue
|
||||
cur_indent = len(l) - len(l.lstrip(' \t'))
|
||||
if cur_indent <= base_indent:
|
||||
break # dedent — end of this depends_on block
|
||||
|
||||
lm = _CHILD_LIST_RE.match(l)
|
||||
if lm and cur_indent == base_indent + 2:
|
||||
services.append(lm.group(2))
|
||||
i += 1
|
||||
continue
|
||||
|
||||
km = _CHILD_KEY_RE.match(l)
|
||||
if km and cur_indent == base_indent + 2:
|
||||
services.append(km.group(2))
|
||||
i += 1
|
||||
# skip nested condition/required/restart lines under this service
|
||||
while i < n:
|
||||
nl = lines[i]
|
||||
if nl.strip() == '':
|
||||
i += 1
|
||||
continue
|
||||
nl_indent = len(nl) - len(nl.lstrip(' \t'))
|
||||
if nl_indent > base_indent + 2:
|
||||
i += 1
|
||||
continue
|
||||
break
|
||||
continue
|
||||
|
||||
# Unexpected shape — bail without transforming to avoid corrupting output
|
||||
parse_ok = False
|
||||
break
|
||||
|
||||
if not parse_ok or not services:
|
||||
# Re-emit whatever we consumed as-is (best effort: fall back to
|
||||
# original slice) rather than risk mangling an unfamiliar shape.
|
||||
pass
|
||||
|
||||
for svc in services:
|
||||
out.append(indent + ' - ' + svc)
|
||||
|
||||
return '\n'.join(out)
|
||||
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
# 2026-08-26 FIX — top-level `name:` property rejected by Swarm:
|
||||
#
|
||||
# `docker compose config` (Compose Spec output) emits a top-level
|
||||
# `name: <project>` key as the first line of the rendered document, e.g.:
|
||||
# name: immich
|
||||
# services:
|
||||
# ...
|
||||
#
|
||||
# This is valid Compose Spec but `docker stack deploy` (Swarm mode) uses
|
||||
# a stricter schema that does NOT allow a top-level `name` property, and
|
||||
# rejects the whole document with: "(root) Additional property name is
|
||||
# not allowed". Single-file stacks (no extras) never hit this because
|
||||
# they skip `docker compose config` and go straight through envsubst on
|
||||
# the raw source YAML, which never had a top-level `name:` to begin with.
|
||||
#
|
||||
# Fix: drop ONLY the top-level `name:` line (column 0, i.e. no leading
|
||||
# whitespace) at the START of the document. Nested `name:` fields under
|
||||
# networks/volumes/secrets (e.g. `name: postgresql_db-backend`, always
|
||||
# indented) are legitimate and must NOT be touched.
|
||||
# ──────────────────────────────────────────────────────────────────────────
|
||||
|
||||
_TOP_NAME_RE = re.compile(r'^name:\s*\S+\s*$')
|
||||
|
||||
def strip_top_level_name(text):
|
||||
lines = text.split('\n')
|
||||
if lines and _TOP_NAME_RE.match(lines[0]):
|
||||
lines = lines[1:]
|
||||
return '\n'.join(lines)
|
||||
|
||||
mode = sys.argv[1]
|
||||
if mode == 'export':
|
||||
for k, v in parse_env(sys.argv[2]):
|
||||
@@ -74,6 +238,15 @@ elif mode == 'export_merged':
|
||||
# export_merged <global.env> <stack.env>
|
||||
for k, v in merge_envs(sys.argv[2], sys.argv[3]):
|
||||
print('export {}={}'.format(k, repr(escape_dollar(v))))
|
||||
elif mode == 'export_raw':
|
||||
# export_raw <env-file> — NO escape_dollar. Use for the docker-compose-
|
||||
# config render path (folder+extras), which does its own '$' escaping.
|
||||
for k, v in parse_env(sys.argv[2]):
|
||||
print('export {}={}'.format(k, repr(v)))
|
||||
elif mode == 'export_raw_merged':
|
||||
# export_raw_merged <global.env> <stack.env> — NO escape_dollar.
|
||||
for k, v in merge_envs(sys.argv[2], sys.argv[3]):
|
||||
print('export {}={}'.format(k, repr(v)))
|
||||
elif mode == 'vars':
|
||||
print(' '.join('$' + k for k, v in parse_env(sys.argv[2])))
|
||||
elif mode == 'vars_merged':
|
||||
@@ -82,4 +255,6 @@ elif mode == 'vars_merged':
|
||||
elif mode == 'strip':
|
||||
t = sys.stdin.read()
|
||||
t = re.sub(r'[ \t]*env_file:[ \t]*\n([ \t]+-[^\n]*\n)+', '', t)
|
||||
t = collapse_depends_on(t)
|
||||
t = strip_top_level_name(t)
|
||||
sys.stdout.write(t)
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
#!/usr/bin/env bash
|
||||
# git-guard.sh — Ensures the compose-files working tree is in sync with Gitea
|
||||
# before any deploy proceeds. Called automatically by stack-deploy.sh.
|
||||
#
|
||||
# Behavior:
|
||||
# - Clean + up to date -> pass silently
|
||||
# - Clean + behind (ff-only) -> auto `git pull --ff-only`, then pass
|
||||
# - Ahead only (unpushed) -> interactive: offer to push; non-interactive: BLOCK
|
||||
# - Dirty tracked changes -> offer to commit + push right now
|
||||
# (auto in non-interactive/CI runs, after a
|
||||
# secret-pattern scan of the staged diff)
|
||||
# - Diverged (local AND -> REFUSE. Never auto-resolves. Prints the
|
||||
# remote both moved) backup/stash/reset recovery steps and exits.
|
||||
#
|
||||
# Exit codes: 0 = safe to deploy, 1 = blocked, needs human intervention
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DIR="/volume1/docker/compose-files"
|
||||
cd "$DIR"
|
||||
|
||||
# Non-interactive detection (Woodpecker/cron have no TTY on stdin)
|
||||
INTERACTIVE=0
|
||||
[ -t 0 ] && INTERACTIVE=1
|
||||
|
||||
echo "==> git-guard: checking repo sync state"
|
||||
|
||||
git fetch origin --quiet
|
||||
|
||||
LOCAL="$(git rev-parse main)"
|
||||
REMOTE="$(git rev-parse origin/main)"
|
||||
BASE="$(git merge-base main origin/main)"
|
||||
|
||||
DIRTY=0
|
||||
git status --porcelain | grep -q . && DIRTY=1
|
||||
|
||||
SECRET_PATTERN='(-----BEGIN [A-Z]+ PRIVATE KEY-----|AKIA[0-9A-Z]{16}|xox[baprs]-[0-9a-zA-Z-]+|password[[:space:]]*[:=][[:space:]]*[^$ ]|api[_-]?key[[:space:]]*[:=][[:space:]]*[^$ ])'
|
||||
|
||||
# ---- Case: dirty tracked changes ----
|
||||
if [ "$DIRTY" -eq 1 ]; then
|
||||
echo "!! WORKING TREE DIRTY — uncommitted changes detected:"
|
||||
git status --short
|
||||
echo
|
||||
|
||||
if [ "$INTERACTIVE" -eq 1 ]; then
|
||||
read -rp "Commit and push these changes to origin/main now? [y/N] " ans
|
||||
else
|
||||
ans="y"
|
||||
echo "(non-interactive session — auto-committing and pushing)"
|
||||
fi
|
||||
|
||||
if [[ "$ans" =~ ^[Yy]$ ]]; then
|
||||
git add -A
|
||||
|
||||
if git diff --cached | grep -Eiq "$SECRET_PATTERN"; then
|
||||
echo "ERROR: possible secret detected in staged changes. Refusing to auto-commit."
|
||||
echo "Review manually: git diff --cached"
|
||||
git reset
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git commit -m "chore(auto): git-guard autofix - commit local changes before deploy $(date -u +%Y-%m-%dT%H:%M:%SZ)"
|
||||
|
||||
if git push origin main; then
|
||||
echo "==> Pushed. Re-checking sync state..."
|
||||
exec "$0" "$@"
|
||||
else
|
||||
echo "ERROR: push failed (likely diverged from origin). Aborting deploy."
|
||||
echo "Run: cd $DIR && git status"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Aborting deploy - commit or stash changes manually, then retry."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# ---- Case: fully in sync ----
|
||||
if [ "$LOCAL" = "$REMOTE" ]; then
|
||||
echo "==> In sync with origin/main ($LOCAL). OK to deploy."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ---- Case: behind only (fast-forwardable) ----
|
||||
if [ "$LOCAL" = "$BASE" ]; then
|
||||
echo "!! Local main is behind origin/main."
|
||||
if [ "$INTERACTIVE" -eq 1 ]; then
|
||||
read -rp "Fast-forward pull now? [y/N] " ans
|
||||
else
|
||||
ans="y"
|
||||
echo "(non-interactive session — auto fast-forwarding)"
|
||||
fi
|
||||
if [[ "$ans" =~ ^[Yy]$ ]]; then
|
||||
git pull --ff-only origin main
|
||||
echo "==> Fast-forwarded to $(git rev-parse --short main). OK to deploy."
|
||||
exit 0
|
||||
else
|
||||
echo "Aborting deploy - pull manually, then retry."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# ---- Case: ahead only (local commits not yet pushed) ----
|
||||
if [ "$REMOTE" = "$BASE" ]; then
|
||||
echo "!! Local main is AHEAD of origin/main (unpushed commits):"
|
||||
git log --oneline "origin/main..main"
|
||||
echo
|
||||
if [ "$INTERACTIVE" -eq 1 ]; then
|
||||
read -rp "Push local commits to origin/main now? [y/N] " ans
|
||||
else
|
||||
ans="n"
|
||||
echo "(non-interactive session — will NOT auto-push ahead commits; needs human review)"
|
||||
fi
|
||||
if [[ "$ans" =~ ^[Yy]$ ]]; then
|
||||
git push origin main
|
||||
echo "==> Pushed. OK to deploy."
|
||||
exit 0
|
||||
else
|
||||
echo "Aborting deploy. Review with: git log origin/main..main"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# ---- Case: true divergence (both ahead and behind) — NEVER auto-fix ----
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
echo "!! DIVERGED: local main and origin/main have both moved independently."
|
||||
echo "!!"
|
||||
echo "!! Local-only commits:"
|
||||
git log --oneline "$BASE..main" | sed 's/^/!! /'
|
||||
echo "!!"
|
||||
echo "!! Remote-only commits:"
|
||||
git log --oneline "$BASE..origin/main" | sed 's/^/!! /'
|
||||
echo "!!"
|
||||
echo "!! This requires a human decision - git-guard will NOT auto-resolve this."
|
||||
echo "!! Recommended recovery:"
|
||||
echo "!! 1. tar backup: tar czf /volume1/docker/compose-files-backup-\$(date +%Y%m%d-%H%M%S).tar.gz -C /volume1/docker compose-files"
|
||||
echo "!! 2. name the branch: git branch backup/pre-reset-\$(date +%Y%m%d)"
|
||||
echo "!! 3. stash all state: git stash push -u -m 'pre-reset-snapshot'"
|
||||
echo "!! 4. reset to origin: git reset --hard origin/main"
|
||||
echo "!! 5. selectively restore needed files from the stash/backup branch"
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
exit 1
|
||||
@@ -0,0 +1,209 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
mount-guard.py — Pre-flight check for bind mount paths before `docker stack deploy`.
|
||||
|
||||
Usage: mount-guard.py <rendered-compose.yml>
|
||||
|
||||
Reads the FINAL rendered compose YAML (after env substitution, right before
|
||||
it would be handed to `docker stack deploy -c -`) and checks:
|
||||
|
||||
1. MISSING PATHS — every bind-mount source path referenced by any service
|
||||
actually exists on disk. Swarm rejects the task at schedule time if not
|
||||
(see: "bind source path does not exist"), but catching it here is
|
||||
faster and clearer, and gives the option to create it on the spot.
|
||||
|
||||
2. SUSPICIOUS POSTGRES DATA DIRS — for any bind mount whose *target*
|
||||
looks like a Postgres data directory, warn if the *source* exists but
|
||||
is empty or missing a PG_VERSION file. This is the class of near-miss
|
||||
from the 2026-08-26 Immich incident: a wrong-but-existing empty path
|
||||
would have let Postgres silently initialize a brand-new database while
|
||||
the real data sat orphaned elsewhere, with no error at all.
|
||||
|
||||
Exit codes: 0 = safe to deploy, 1 = blocked / aborted.
|
||||
|
||||
Interactive sessions get a prompt with remediation options. Non-interactive
|
||||
sessions (Woodpecker, cron, CI) NEVER auto-proceed past a finding here —
|
||||
this is a data-safety check, not a convenience autofix.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
import re
|
||||
import yaml
|
||||
|
||||
|
||||
def is_bind_like(path):
|
||||
return isinstance(path, str) and (
|
||||
path.startswith('/') or path.startswith('./') or path.startswith('../')
|
||||
)
|
||||
|
||||
|
||||
def gather_bind_mounts(doc):
|
||||
"""Return list of (service_name, target, source) for host-path bind mounts.
|
||||
|
||||
Handles both compose-file syntaxes that can appear in a rendered stack:
|
||||
- short form: "hostpath:containerpath[:mode]" (raw single-file path)
|
||||
- long form: {type: bind, source: ..., target: ...} (post `docker compose config`)
|
||||
Named volumes (source has no leading '/', './', '../') are intentionally skipped.
|
||||
"""
|
||||
results = []
|
||||
services = doc.get('services') or {}
|
||||
for svc_name, svc in services.items():
|
||||
if not isinstance(svc, dict):
|
||||
continue
|
||||
|
||||
for v in (svc.get('volumes') or []):
|
||||
if isinstance(v, str):
|
||||
parts = v.split(':')
|
||||
if len(parts) >= 2 and is_bind_like(parts[0]):
|
||||
results.append((svc_name, parts[1], parts[0]))
|
||||
elif isinstance(v, dict):
|
||||
if v.get('type') == 'bind':
|
||||
src = v.get('source')
|
||||
tgt = v.get('target')
|
||||
if is_bind_like(src):
|
||||
results.append((svc_name, tgt, src))
|
||||
|
||||
# devices: short form "host:container[:mode]" (rarely used in this repo —
|
||||
# devices are conventionally expressed as bind-mounted volumes instead,
|
||||
# for Docker Swarm / DDM compatibility — but handle it if present).
|
||||
for d in (svc.get('devices') or []):
|
||||
if isinstance(d, str):
|
||||
parts = d.split(':')
|
||||
if parts and is_bind_like(parts[0]):
|
||||
tgt = parts[1] if len(parts) > 1 else parts[0]
|
||||
results.append((svc_name, tgt, parts[0]))
|
||||
|
||||
return results
|
||||
|
||||
|
||||
_PG_TARGET_RE = re.compile(r'postgres', re.IGNORECASE)
|
||||
|
||||
|
||||
def looks_like_postgres_target(target):
|
||||
return bool(target) and bool(_PG_TARGET_RE.search(target))
|
||||
|
||||
|
||||
def check_postgres_data(path):
|
||||
"""Return a warning string if `path` looks like an empty/uninitialized
|
||||
Postgres data directory. Returns None if it looks fine. Caller must
|
||||
ensure `path` already exists before calling this."""
|
||||
if not os.path.isdir(path):
|
||||
# Exists but isn't a directory (e.g. a file) — a different, separate
|
||||
# problem; the missing-path style check doesn't apply, but this is
|
||||
# clearly wrong too.
|
||||
return "exists but is not a directory"
|
||||
try:
|
||||
entries = os.listdir(path)
|
||||
except PermissionError:
|
||||
return "cannot list directory contents (permission denied) — unable to verify"
|
||||
if not entries:
|
||||
return "directory exists but is EMPTY — looks like an uninitialized/wrong Postgres data dir"
|
||||
if 'PG_VERSION' not in entries:
|
||||
return "directory exists and is non-empty but has no PG_VERSION file — does not look like a real Postgres data directory"
|
||||
return None
|
||||
|
||||
|
||||
def prompt(question, choices):
|
||||
"""choices: dict of key -> description. Returns the chosen key (lowercase)."""
|
||||
print("Options:")
|
||||
for k, desc in choices.items():
|
||||
print(f" [{k}] {desc}")
|
||||
while True:
|
||||
ans = input(f"{question} [{'/'.join(choices.keys())}]: ").strip().lower()
|
||||
if ans in choices:
|
||||
return ans
|
||||
print(f"Please enter one of: {', '.join(choices.keys())}")
|
||||
|
||||
|
||||
def main():
|
||||
if len(sys.argv) != 2:
|
||||
print("Usage: mount-guard.py <rendered-compose.yml>", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
rendered_path = sys.argv[1]
|
||||
with open(rendered_path) as f:
|
||||
doc = yaml.safe_load(f)
|
||||
|
||||
if not doc or 'services' not in doc:
|
||||
print("!! mount-guard: rendered YAML has no 'services' key — refusing to guess, blocking.")
|
||||
return 1
|
||||
|
||||
mounts = gather_bind_mounts(doc)
|
||||
|
||||
missing = []
|
||||
pg_warnings = []
|
||||
|
||||
for svc_name, target, src in mounts:
|
||||
if not os.path.exists(src):
|
||||
missing.append((svc_name, target, src))
|
||||
continue
|
||||
if looks_like_postgres_target(target):
|
||||
warn = check_postgres_data(src)
|
||||
if warn:
|
||||
pg_warnings.append((svc_name, target, src, warn))
|
||||
|
||||
if not missing and not pg_warnings:
|
||||
print(f"==> mount-guard: {len(mounts)} bind mount path(s) checked, all present and sane. OK to deploy.")
|
||||
return 0
|
||||
|
||||
print("!! mount-guard found potential issues with bind mount paths:\n")
|
||||
|
||||
if missing:
|
||||
print("MISSING PATHS (Swarm will reject the task if these aren't created first):")
|
||||
for svc_name, target, src in missing:
|
||||
print(f" - service '{svc_name}': {src} (mounted at {target})")
|
||||
print()
|
||||
|
||||
if pg_warnings:
|
||||
print("SUSPICIOUS POSTGRES DATA DIRECTORIES:")
|
||||
print(" Path exists, but contents don't look like a real Postgres data dir.")
|
||||
print(" This is the exact shape of the 2026-08-26 Immich near-miss: a wrong")
|
||||
print(" bind path that HAPPENED to exist (empty) would have let Postgres")
|
||||
print(" silently init a new empty DB while the real data sat orphaned")
|
||||
print(" elsewhere — with no error or warning from Docker at all.")
|
||||
for svc_name, target, src, warn in pg_warnings:
|
||||
print(f" - service '{svc_name}': {src} (mounted at {target})")
|
||||
print(f" {warn}")
|
||||
print()
|
||||
|
||||
interactive = sys.stdin.isatty()
|
||||
|
||||
if not interactive:
|
||||
print("(non-interactive session — mount-guard will NOT auto-proceed on any finding above)")
|
||||
print("Re-run interactively to review and decide, or fix the paths and retry.")
|
||||
return 1
|
||||
|
||||
if missing:
|
||||
choices = {
|
||||
'a': 'Abort deploy (recommended if any path above is unexpected)',
|
||||
'm': 'mkdir -p the missing path(s) now, then continue',
|
||||
'c': 'Continue anyway without creating them (will likely fail at Swarm scheduling)',
|
||||
}
|
||||
ans = prompt("Missing bind mount paths found. Choice", choices)
|
||||
if ans == 'a':
|
||||
print("Aborting deploy.")
|
||||
return 1
|
||||
if ans == 'm':
|
||||
for _, _, src in missing:
|
||||
print(f" mkdir -p {src}")
|
||||
os.makedirs(src, exist_ok=True)
|
||||
print("==> Created missing path(s). Continuing.")
|
||||
# 'c' falls through and continues without creating
|
||||
|
||||
if pg_warnings:
|
||||
choices = {
|
||||
'a': 'Abort deploy (recommended unless you intended a fresh Postgres init here)',
|
||||
'c': 'Continue anyway (I have verified this is expected, e.g. legitimate first-time init)',
|
||||
}
|
||||
ans = prompt("Suspicious Postgres data directory found. Choice", choices)
|
||||
if ans == 'a':
|
||||
print("Aborting deploy.")
|
||||
return 1
|
||||
print("==> Continuing deploy despite Postgres data warning, per operator confirmation.")
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
+64
-17
@@ -20,14 +20,38 @@
|
||||
# All files in the folder matching *.yml or *.yaml are included.
|
||||
# Main file (<stack>.yml or <stack>.yaml) is always passed FIRST.
|
||||
# Remaining files are sorted and appended.
|
||||
#
|
||||
# Render pipeline (unified for all modes as of 2026-08-26):
|
||||
# 1. Render full compose YAML (with extras merged + env substituted) to a
|
||||
# temp file.
|
||||
# 2. Run mount-guard.py against that temp file — checks every bind mount
|
||||
# source path exists, and flags suspicious-looking empty Postgres data
|
||||
# dirs, before anything touches Swarm.
|
||||
# 3. docker stack deploy -c <tempfile> <stack>
|
||||
#
|
||||
# Dollar-escaping (2026-08-26, see envparse.py comments for full detail):
|
||||
# - Single-file path (no extras): envsubst does no '$' escaping of its
|
||||
# own, and only Swarm's `docker stack deploy` interpolation pass runs
|
||||
# downstream -> use export/export_merged (escapes '$' -> '$$' once).
|
||||
# - Folder+extras path: `docker compose config` ALSO does its own '$'
|
||||
# escaping on top of Swarm's -> use export_raw/export_raw_merged (no
|
||||
# pre-escaping) or values get doubled twice. Getting this wrong
|
||||
# silently corrupts any secret/hash containing '$' (confirmed impact:
|
||||
# LITELLM keys truncated, IMMICH_KIOSK_BASICAUTH bcrypt hash mismatched).
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
STACK="${1:?Usage: stack-deploy.sh <stack-name>}"
|
||||
DIR="/volume1/docker/compose-files"
|
||||
PY="$DIR/deploy/envparse.py"
|
||||
MOUNT_GUARD="$DIR/deploy/mount-guard.py"
|
||||
GLOBAL_ENV="$DIR/deploy/global.env"
|
||||
|
||||
# ── Pre-flight: ensure local checkout is in sync with Gitea ─────────────────
|
||||
# Prevents deploying from a stale/diverged local tree (see incident 2026-08-26).
|
||||
# Invoked via `bash` explicitly so the tracked file's exec bit doesn't matter.
|
||||
bash "$DIR/deploy/git-guard.sh" || { echo "ERROR: git-guard check failed. Deploy aborted."; exit 1; }
|
||||
|
||||
# ── Locate compose file(s) ──────────────────────────────────────────────────
|
||||
|
||||
FOLDER="$DIR/$STACK"
|
||||
@@ -80,6 +104,12 @@ for f in "${EXTRAS[@]:-}"; do
|
||||
[ -n "$f" ] && F_FLAGS+=(-f "$f")
|
||||
done
|
||||
|
||||
# Whether the render will go through `docker compose config` (folder mode
|
||||
# with 1+ extras). This determines which escaping mode is correct — see
|
||||
# header comment and envparse.py for why these must differ.
|
||||
USES_COMPOSE_CONFIG=0
|
||||
[ "${#F_FLAGS[@]}" -gt 2 ] && USES_COMPOSE_CONFIG=1
|
||||
|
||||
# ── Load env (global base + optional stack override) ─────────────────────────
|
||||
|
||||
HINT=" Hint: 'secret not found' means Woodpecker hasn't provisioned secrets yet.\n Trigger the pipeline: https://woodpecker.bryanmail.net\n"
|
||||
@@ -89,19 +119,25 @@ STACK_EXISTS=0
|
||||
[ -f "$GLOBAL_ENV" ] && GLOBAL_EXISTS=1
|
||||
[ -f "$ENVFILE" ] && STACK_EXISTS=1
|
||||
|
||||
if [ "$USES_COMPOSE_CONFIG" -eq 1 ]; then
|
||||
EXPORT_MODE="export_raw"; EXPORT_MERGED_MODE="export_raw_merged"
|
||||
else
|
||||
EXPORT_MODE="export"; EXPORT_MERGED_MODE="export_merged"
|
||||
fi
|
||||
|
||||
if [ "$GLOBAL_EXISTS" -eq 1 ] && [ "$STACK_EXISTS" -eq 1 ]; then
|
||||
echo " Env: $GLOBAL_ENV + $ENVFILE (stack overrides global)"
|
||||
eval "$(python3 "$PY" export_merged "$GLOBAL_ENV" "$ENVFILE")"
|
||||
echo " Env: $GLOBAL_ENV + $ENVFILE (stack overrides global) [$EXPORT_MERGED_MODE]"
|
||||
eval "$(python3 "$PY" "$EXPORT_MERGED_MODE" "$GLOBAL_ENV" "$ENVFILE")"
|
||||
VARS="$(python3 "$PY" vars_merged "$GLOBAL_ENV" "$ENVFILE")"
|
||||
|
||||
elif [ "$GLOBAL_EXISTS" -eq 1 ]; then
|
||||
echo " Env: $GLOBAL_ENV (no stack env)"
|
||||
eval "$(python3 "$PY" export "$GLOBAL_ENV")"
|
||||
echo " Env: $GLOBAL_ENV (no stack env) [$EXPORT_MODE]"
|
||||
eval "$(python3 "$PY" "$EXPORT_MODE" "$GLOBAL_ENV")"
|
||||
VARS="$(python3 "$PY" vars "$GLOBAL_ENV")"
|
||||
|
||||
elif [ "$STACK_EXISTS" -eq 1 ]; then
|
||||
echo " Env: $ENVFILE (no global env)"
|
||||
eval "$(python3 "$PY" export "$ENVFILE")"
|
||||
echo " Env: $ENVFILE (no global env) [$EXPORT_MODE]"
|
||||
eval "$(python3 "$PY" "$EXPORT_MODE" "$ENVFILE")"
|
||||
VARS="$(python3 "$PY" vars "$ENVFILE")"
|
||||
|
||||
else
|
||||
@@ -111,33 +147,44 @@ fi
|
||||
|
||||
echo " Vars: $VARS"
|
||||
|
||||
# ── Deploy ───────────────────────────────────────────────────────────────────
|
||||
# ── Render final compose YAML to a temp file ──────────────────────────────────
|
||||
|
||||
RENDERED="$(mktemp /tmp/stack-deploy.XXXXXX.yml)"
|
||||
trap 'rm -f "$RENDERED"' EXIT
|
||||
|
||||
if [ -n "$VARS" ]; then
|
||||
if [ "${#F_FLAGS[@]}" -gt 2 ]; then
|
||||
if [ "$USES_COMPOSE_CONFIG" -eq 1 ]; then
|
||||
# Folder mode with extras: merge via docker compose config
|
||||
docker compose "${F_FLAGS[@]}" config \
|
||||
| python3 "$PY" strip \
|
||||
| envsubst "$VARS" \
|
||||
| docker stack deploy -c - "$STACK" \
|
||||
|| { printf "\n%b" "$HINT"; exit 1; }
|
||||
> "$RENDERED"
|
||||
else
|
||||
# Single file
|
||||
envsubst "$VARS" < "$MAIN" \
|
||||
| python3 "$PY" strip \
|
||||
| docker stack deploy -c - "$STACK" \
|
||||
|| { printf "\n%b" "$HINT"; exit 1; }
|
||||
> "$RENDERED"
|
||||
fi
|
||||
else
|
||||
if [ "${#F_FLAGS[@]}" -gt 2 ]; then
|
||||
if [ "$USES_COMPOSE_CONFIG" -eq 1 ]; then
|
||||
docker compose "${F_FLAGS[@]}" config \
|
||||
| python3 "$PY" strip \
|
||||
| docker stack deploy -c - "$STACK" \
|
||||
|| { printf "\n%b" "$HINT"; exit 1; }
|
||||
> "$RENDERED"
|
||||
else
|
||||
docker stack deploy -c "$MAIN" "$STACK" \
|
||||
|| { printf "\n%b" "$HINT"; exit 1; }
|
||||
python3 "$PY" strip < "$MAIN" > "$RENDERED"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Pre-flight: bind mount paths exist + Postgres-data sanity ───────────────
|
||||
# See deploy/mount-guard.py for details. Blocks on missing paths or
|
||||
# suspicious-looking empty/uninitialized Postgres data directories (see
|
||||
# incident 2026-08-26: a wrong-but-existing empty bind path would have let
|
||||
# Postgres silently init a fresh DB while real data sat orphaned elsewhere).
|
||||
python3 "$MOUNT_GUARD" "$RENDERED" || { echo "ERROR: mount-guard check failed. Deploy aborted."; exit 1; }
|
||||
|
||||
# ── Deploy ───────────────────────────────────────────────────────────────────
|
||||
|
||||
docker stack deploy -c "$RENDERED" "$STACK" \
|
||||
|| { printf "\n%b" "$HINT"; exit 1; }
|
||||
|
||||
echo "==> Done: $STACK"
|
||||
|
||||
@@ -1,11 +1,25 @@
|
||||
# Immich stack environment variables - EXAMPLE
|
||||
# Copy to immich.env and fill in actual values
|
||||
# Pattern C (partial): DB_PASSWORD as Docker secret (_FILE), IMMICH_KIOSK_BASICAUTH in host .env (Traefik label)
|
||||
# Copy this to immich.env (untracked, see .gitignore) and fill in
|
||||
# IMMICH_KIOSK_BASICAUTH with a real value. Do NOT commit immich.env.
|
||||
#
|
||||
# Pattern C (partial): DB_PASSWORD as Docker secret (_FILE), IMMICH_KIOSK_BASICAUTH
|
||||
# in host .env (Traefik label).
|
||||
#
|
||||
# NOTE 2026-08-26: the paths below are the REAL, confirmed-correct values for
|
||||
# this homelab (verified via `docker service inspect immich_<svc> --format
|
||||
# '{{json .PreviousSpec.TaskTemplate.ContainerSpec.Mounts}}'` against actual
|
||||
# on-disk data). An earlier version of this file had plausible-looking but
|
||||
# WRONG generic paths (/volume1/docker/immich/db, /volume1/docker/immich/uploads),
|
||||
# which caused a real incident when immich.env was regenerated from this
|
||||
# template without checking against the live services first. If you ever
|
||||
# need to regenerate immich.env from this file, these paths should still be
|
||||
# correct — but if in doubt, re-verify with the PreviousSpec command above
|
||||
# before deploying.
|
||||
|
||||
IMMICH_VERSION=release
|
||||
UPLOAD_LOCATION=/volume1/docker/immich/uploads
|
||||
BULK_UPLOAD_LOCATION=/volume1/docker/immich/bulk-uploads
|
||||
DB_DATA_LOCATION=/volume1/docker/immich/db
|
||||
UPLOAD_LOCATION=/volume1/Immich-Photos/
|
||||
BULK_UPLOAD_LOCATION=/volume1/Immich-Photos/bulk-upload
|
||||
DB_DATA_LOCATION=/volume1/docker/immich-postgresql
|
||||
REDIS_DATA_LOCATION=/volume1/docker/immich/redis
|
||||
|
||||
DB_USERNAME=immich
|
||||
@@ -20,4 +34,4 @@ REDIS_DBINDEX=0
|
||||
IMMICH_TRUSTED_PROXIES=172.16.0.0/12
|
||||
IMMICH_TRAEFIK_HOST=immich.bryanmail.net
|
||||
IMMICH_KIOSK_HOST=immich-kiosk.bryanmail.net
|
||||
IMMICH_KIOSK_BASICAUTH=user:password
|
||||
IMMICH_KIOSK_BASICAUTH=user:changeme
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
{
|
||||
"mcpServers": {
|
||||
"filesystem": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"@modelcontextprotocol/server-filesystem",
|
||||
"/mcpo_data/filesystem"
|
||||
]
|
||||
},
|
||||
"memory": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"@modelcontextprotocol/server-memory"
|
||||
]
|
||||
},
|
||||
"proxmox-nuck7-1": {
|
||||
"command": "sh",
|
||||
"args": [
|
||||
"-c",
|
||||
"LOG_LEVEL=silent npx -y --package @bldg-7/proxmox-mcp@1.2.1 --package pino-pretty proxmox-mcp 2>/dev/null"
|
||||
],
|
||||
"env": {
|
||||
"PROXMOX_HOST": "192.168.4.11",
|
||||
"PROXMOX_PORT": "8006",
|
||||
"PROXMOX_USER": "MCP@pve",
|
||||
"PROXMOX_TOKEN_NAME": "MCP",
|
||||
"PROXMOX_TOKEN_VALUE": "2052990e-749f-43f6-be7f-c9ad206281cc",
|
||||
"PROXMOX_SSL_MODE": "insecure",
|
||||
"PROXMOX_ALLOW_ELEVATED": "true",
|
||||
"PROXMOX_SSH_ENABLED": "true",
|
||||
"PROXMOX_SSH_HOST": "192.168.4.11",
|
||||
"PROXMOX_SSH_PORT": "22",
|
||||
"PROXMOX_SSH_USER": "root",
|
||||
"PROXMOX_SSH_KEY_PATH": "/app/ssh_keys/nuc-cluster",
|
||||
"PROXMOX_SSH_NODE": "nuck7-1",
|
||||
"PROXMOX_ALLOW_UNSAFE_COMMANDS": "true"
|
||||
}
|
||||
},
|
||||
"proxmox-nuck7-2": {
|
||||
"command": "sh",
|
||||
"args": [
|
||||
"-c",
|
||||
"LOG_LEVEL=silent npx -y --package @bldg-7/proxmox-mcp@1.2.1 --package pino-pretty proxmox-mcp 2>/dev/null"
|
||||
],
|
||||
"env": {
|
||||
"PROXMOX_HOST": "192.168.4.12",
|
||||
"PROXMOX_PORT": "8006",
|
||||
"PROXMOX_USER": "MCP@pve",
|
||||
"PROXMOX_TOKEN_NAME": "MCP",
|
||||
"PROXMOX_TOKEN_VALUE": "2052990e-749f-43f6-be7f-c9ad206281cc",
|
||||
"PROXMOX_SSL_MODE": "insecure",
|
||||
"PROXMOX_ALLOW_ELEVATED": "true",
|
||||
"PROXMOX_SSH_ENABLED": "true",
|
||||
"PROXMOX_SSH_HOST": "192.168.4.12",
|
||||
"PROXMOX_SSH_PORT": "22",
|
||||
"PROXMOX_SSH_USER": "root",
|
||||
"PROXMOX_SSH_KEY_PATH": "/app/ssh_keys/nuc-cluster",
|
||||
"PROXMOX_SSH_NODE": "nuck7-2",
|
||||
"PROXMOX_ALLOW_UNSAFE_COMMANDS": "true"
|
||||
}
|
||||
},
|
||||
"proxmox-nuck7-3": {
|
||||
"command": "sh",
|
||||
"args": [
|
||||
"-c",
|
||||
"LOG_LEVEL=silent npx -y --package @bldg-7/proxmox-mcp@1.2.1 --package pino-pretty proxmox-mcp 2>/dev/null"
|
||||
],
|
||||
"env": {
|
||||
"PROXMOX_HOST": "192.168.4.13",
|
||||
"PROXMOX_PORT": "8006",
|
||||
"PROXMOX_USER": "MCP@pve",
|
||||
"PROXMOX_TOKEN_NAME": "MCP",
|
||||
"PROXMOX_TOKEN_VALUE": "2052990e-749f-43f6-be7f-c9ad206281cc",
|
||||
"PROXMOX_SSL_MODE": "insecure",
|
||||
"PROXMOX_ALLOW_ELEVATED": "true",
|
||||
"PROXMOX_SSH_ENABLED": "true",
|
||||
"PROXMOX_SSH_HOST": "192.168.4.13",
|
||||
"PROXMOX_SSH_PORT": "22",
|
||||
"PROXMOX_SSH_USER": "root",
|
||||
"PROXMOX_SSH_KEY_PATH": "/app/ssh_keys/nuc-cluster",
|
||||
"PROXMOX_SSH_NODE": "nuck7-3",
|
||||
"PROXMOX_ALLOW_UNSAFE_COMMANDS": "true"
|
||||
}
|
||||
},
|
||||
"homeassistant": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"mcp-remote",
|
||||
"https://home.bryanmail.net/mcp_server/sse",
|
||||
"--header",
|
||||
"Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIxNzhmYzI0NjA2Y2I0ZTg4ODI1N2VmMzdiZTNhY2E5YSIsImlhdCI6MTc3NDY4MzAxNiwiZXhwIjoyMDkwMDQzMDE2fQ.32kY2LVHzKZHWLc96T6z2P-8beNTnp2DHRUf2UEie2w"
|
||||
]
|
||||
},
|
||||
"teams": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"@floriscornel/teams-mcp@latest"
|
||||
],
|
||||
"env": {
|
||||
"TEAMS_MCP_READ_ONLY": "true",
|
||||
"HOME": "/app/teams-mcp-auth"
|
||||
}
|
||||
},
|
||||
"ms365": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"@softeria/ms-365-mcp-server@0.129.0",
|
||||
"--preset",
|
||||
"personal",
|
||||
"--read-only",
|
||||
"--discovery"
|
||||
],
|
||||
"env": {
|
||||
"HOME": "/app/teams-mcp-auth",
|
||||
"MS365_MCP_CLIENT_ID": "14d82eec-204b-4c2f-b7e8-296a70dab67e",
|
||||
"MS365_MCP_TOKEN_CACHE_PATH": "/app/teams-mcp-auth/.teams-mcp-token-cache.json",
|
||||
"SILENT": "true"
|
||||
}
|
||||
},
|
||||
"unifi-network": {
|
||||
"command": "uvx",
|
||||
"args": [
|
||||
"unifi-network-mcp@latest"
|
||||
],
|
||||
"env": {
|
||||
"UNIFI_HOST": "192.168.4.1",
|
||||
"UNIFI_USERNAME": "unifi-mcp",
|
||||
"UNIFI_PASSWORD": "3dHOEOMygTYeX3",
|
||||
"UNIFI_PORT": "443",
|
||||
"UNIFI_VERIFY_SSL": "false",
|
||||
"UV_CACHE_DIR": "/app/uv-cache"
|
||||
}
|
||||
},
|
||||
"authentik": {
|
||||
"command": "uvx",
|
||||
"args": [
|
||||
"authentik-diag-mcp",
|
||||
"--base-url",
|
||||
"https://auth.bryanmail.net",
|
||||
"--token",
|
||||
"LAm3lBTumOmsU8AiFQM2FmCZyoj8bTSR0FQnAcBy1QnTMEyU4oWozwdxTUap"
|
||||
]
|
||||
},
|
||||
"gitea": {
|
||||
"command": "/mcpo_data/gitea-mcp",
|
||||
"args": [
|
||||
"-t",
|
||||
"stdio"
|
||||
],
|
||||
"env": {
|
||||
"GITEA_HOST": "https://git.bryanmail.net",
|
||||
"GITEA_ACCESS_TOKEN": "5aa3a554c001b1dbe5215cb8cb388112801930e9"
|
||||
}
|
||||
},
|
||||
"gitea-admin": {
|
||||
"command": "/mcpo_data/gitea-mcp",
|
||||
"args": [
|
||||
"-t",
|
||||
"stdio"
|
||||
],
|
||||
"env": {
|
||||
"GITEA_HOST": "https://git.bryanmail.net",
|
||||
"GITEA_ACCESS_TOKEN": "289225b0b8f1827242191874b2408db76af06321"
|
||||
}
|
||||
},
|
||||
"powerautomate": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"powerautomate-mcp@latest",
|
||||
"--stdio"
|
||||
],
|
||||
"env": {
|
||||
"HOME": "/app/powerautomate-auth",
|
||||
"PA_MCP_CLIENT_ID": "84b431ed-ef5d-48a0-b0a1-878cfdb71453",
|
||||
"PA_MCP_TENANT_ID": "0f6cf991-c449-480a-a71b-83003ce6edc1",
|
||||
"PA_CONFIG_PATH": "/app/powerautomate-auth/config.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,217 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
// Minimal MCP server (stdio, JSON-RPC 2.0) for Woodpecker CI.
|
||||
// Zero dependencies — plain Node 18+ (built-in fetch). Config via env vars.
|
||||
//
|
||||
// Configuration (env):
|
||||
// WOODPECKER_URL e.g. https://your-woodpecker.example.com
|
||||
// WOODPECKER_TOKEN Woodpecker Personal Access Token (JWT)
|
||||
//
|
||||
// Tools:
|
||||
// woodpecker_list_repos
|
||||
// woodpecker_list_pipelines { repo_id, limit? }
|
||||
// woodpecker_get_pipeline { repo_id, number } -> status + workflow/step tree
|
||||
// woodpecker_pipeline_logs { repo_id, number, step_id, tail? } -> decoded step logs
|
||||
|
||||
import { Buffer } from "node:buffer";
|
||||
|
||||
const BASE = (process.env.WOODPECKER_URL || "").replace(/\/+$/, "");
|
||||
const TOKEN = process.env.WOODPECKER_TOKEN || "";
|
||||
|
||||
function log(...a) {
|
||||
// Diagnostics go to stderr so they never corrupt the stdout JSON-RPC stream.
|
||||
process.stderr.write("[woodpecker-mcp] " + a.join(" ") + "\n");
|
||||
}
|
||||
|
||||
async function api(path) {
|
||||
if (!BASE || !TOKEN) throw new Error("Missing WOODPECKER_URL or WOODPECKER_TOKEN in environment");
|
||||
const res = await fetch(`${BASE}/api${path}`, {
|
||||
headers: { Authorization: `Bearer ${TOKEN}`, Accept: "application/json" },
|
||||
});
|
||||
const body = await res.text();
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status} ${path}: ${body.slice(0, 300)}`);
|
||||
return body ? JSON.parse(body) : null;
|
||||
}
|
||||
|
||||
// --- tool response formatting ---
|
||||
|
||||
function summarizePipeline(p) {
|
||||
const lines = [];
|
||||
lines.push(`pipeline #${p.number} (id=${p.id}) status=${p.status} event=${p.event} branch=${p.branch}`);
|
||||
lines.push(`commit=${(p.commit || "").slice(0, 12)} author=${p.author}`);
|
||||
if (p.message) lines.push(`message: ${p.message.split("\n")[0]}`);
|
||||
for (const wf of p.workflows || []) {
|
||||
lines.push(` WORKFLOW "${wf.name}" (pid=${wf.pid}) state=${wf.state}${wf.error ? ` error=${wf.error}` : ""}`);
|
||||
for (const c of wf.children || []) {
|
||||
lines.push(
|
||||
` step "${c.name}" (id=${c.id}, pid=${c.pid}) ${c.state} exit=${c.exit_code ?? "-"} type=${c.type}`
|
||||
);
|
||||
}
|
||||
}
|
||||
return lines.join("\n");
|
||||
}
|
||||
|
||||
function decodeLogs(entries) {
|
||||
if (!Array.isArray(entries)) return String(entries);
|
||||
return entries
|
||||
.map((e) => {
|
||||
const d = e?.data;
|
||||
if (d == null) return "";
|
||||
try {
|
||||
return Buffer.from(d, "base64").toString("utf-8");
|
||||
} catch {
|
||||
return String(d);
|
||||
}
|
||||
})
|
||||
.join("");
|
||||
}
|
||||
|
||||
const TOOLS = [
|
||||
{
|
||||
name: "woodpecker_list_repos",
|
||||
description: "List repositories the token can access (id, full name, default branch).",
|
||||
inputSchema: { type: "object", properties: {}, additionalProperties: false },
|
||||
handler: async () => {
|
||||
const repos = await api(`/user/repos`);
|
||||
return (repos || [])
|
||||
.map((r) => `id=${r.id} ${r.full_name} default_branch=${r.default_branch}`)
|
||||
.join("\n") || "(no repositories)";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "woodpecker_list_pipelines",
|
||||
description: "Recent pipelines for a repository. Params: repo_id (number), limit (number, default 20).",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
repo_id: { type: "number", description: "Woodpecker repository ID" },
|
||||
limit: { type: "number", description: "How many pipelines to return (default 20)" },
|
||||
},
|
||||
required: ["repo_id"],
|
||||
additionalProperties: false,
|
||||
},
|
||||
handler: async ({ repo_id, limit }) => {
|
||||
const list = await api(`/repos/${repo_id}/pipelines?perPage=${limit || 20}`);
|
||||
return (list || [])
|
||||
.map(
|
||||
(p) =>
|
||||
`#${p.number} ${p.status.padEnd(8)} ${p.event.padEnd(12)} ${p.branch} ${(p.commit || "").slice(0, 8)} ${(p.message || "").split("\n")[0]}`
|
||||
)
|
||||
.join("\n") || "(no pipelines)";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "woodpecker_get_pipeline",
|
||||
description: "Pipeline details: status plus the workflow/step tree (with step ids for fetching logs). Params: repo_id, number.",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
repo_id: { type: "number" },
|
||||
number: { type: "number", description: "Pipeline number (as shown in the UI)" },
|
||||
},
|
||||
required: ["repo_id", "number"],
|
||||
additionalProperties: false,
|
||||
},
|
||||
handler: async ({ repo_id, number }) => {
|
||||
const p = await api(`/repos/${repo_id}/pipelines/${number}`);
|
||||
return summarizePipeline(p);
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "woodpecker_pipeline_logs",
|
||||
description: "Decoded logs for a single step. Params: repo_id, number (pipeline), step_id (from woodpecker_get_pipeline). Optional tail (last N lines).",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
repo_id: { type: "number" },
|
||||
number: { type: "number" },
|
||||
step_id: { type: "number", description: "Step id from woodpecker_get_pipeline" },
|
||||
tail: { type: "number", description: "Return only the last N lines (optional)" },
|
||||
},
|
||||
required: ["repo_id", "number", "step_id"],
|
||||
additionalProperties: false,
|
||||
},
|
||||
handler: async ({ repo_id, number, step_id, tail }) => {
|
||||
const entries = await api(`/repos/${repo_id}/logs/${number}/${step_id}`);
|
||||
let txt = decodeLogs(entries);
|
||||
if (tail && tail > 0) {
|
||||
txt = txt.split("\n").slice(-tail).join("\n");
|
||||
}
|
||||
return txt || "(no logs)";
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
// --- JSON-RPC over stdio loop ---
|
||||
|
||||
function send(msg) {
|
||||
process.stdout.write(JSON.stringify(msg) + "\n");
|
||||
}
|
||||
|
||||
function reply(id, result) {
|
||||
send({ jsonrpc: "2.0", id, result });
|
||||
}
|
||||
|
||||
function replyError(id, code, message) {
|
||||
send({ jsonrpc: "2.0", id, error: { code, message } });
|
||||
}
|
||||
|
||||
async function handle(req) {
|
||||
const { id, method, params } = req;
|
||||
if (method === "initialize") {
|
||||
reply(id, {
|
||||
protocolVersion: params?.protocolVersion || "2024-11-05",
|
||||
capabilities: { tools: {} },
|
||||
serverInfo: { name: "woodpecker-mcp", version: "1.0.0" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (method === "notifications/initialized" || method === "notifications/cancelled") {
|
||||
return; // notifications carry no response
|
||||
}
|
||||
if (method === "ping") {
|
||||
reply(id, {});
|
||||
return;
|
||||
}
|
||||
if (method === "tools/list") {
|
||||
reply(id, {
|
||||
tools: TOOLS.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })),
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (method === "tools/call") {
|
||||
const tool = TOOLS.find((t) => t.name === params?.name);
|
||||
if (!tool) {
|
||||
replyError(id, -32602, `Unknown tool: ${params?.name}`);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const text = await tool.handler(params.arguments || {});
|
||||
reply(id, { content: [{ type: "text", text }] });
|
||||
} catch (e) {
|
||||
reply(id, { content: [{ type: "text", text: `Error: ${e.message}` }], isError: true });
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (id !== undefined) replyError(id, -32601, `Unsupported method: ${method}`);
|
||||
}
|
||||
|
||||
let buf = "";
|
||||
process.stdin.setEncoding("utf-8");
|
||||
process.stdin.on("data", (chunk) => {
|
||||
buf += chunk;
|
||||
let nl;
|
||||
while ((nl = buf.indexOf("\n")) >= 0) {
|
||||
const line = buf.slice(0, nl).trim();
|
||||
buf = buf.slice(nl + 1);
|
||||
if (!line) continue;
|
||||
let req;
|
||||
try {
|
||||
req = JSON.parse(line);
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
handle(req).catch((e) => log("handler error:", e.message));
|
||||
}
|
||||
});
|
||||
process.stdin.on("end", () => process.exit(0));
|
||||
log("ready", BASE ? `(${BASE})` : "(WOODPECKER_URL is not set!)");
|
||||
@@ -5,8 +5,8 @@ services:
|
||||
KEEPALIVED_INTERFACE: eth0
|
||||
KEEPALIVED_PRIORITY: "150"
|
||||
KEEPALIVED_ROUTER_ID: "51"
|
||||
KEEPALIVED_PASSWORD: ${KEEPALIVED_PASSWORD}
|
||||
KEEPALIVED_VIRTUAL_IPS: ${KEEPALIVED_VIRTUAL_IPS}
|
||||
KEEPALIVED_PASSWORD: "${KEEPALIVED_PASSWORD}"
|
||||
KEEPALIVED_VIRTUAL_IPS: "${KEEPALIVED_VIRTUAL_IPS}"
|
||||
KEEPALIVED_UNICAST_PEERS: "#PYTHON2BASH:['192.168.4.31', '192.168.4.32']"
|
||||
command: --copy-service
|
||||
cap_add: [NET_ADMIN, NET_BROADCAST, NET_RAW]
|
||||
@@ -39,8 +39,8 @@ services:
|
||||
KEEPALIVED_INTERFACE: eth0
|
||||
KEEPALIVED_PRIORITY: "100"
|
||||
KEEPALIVED_ROUTER_ID: "51"
|
||||
KEEPALIVED_PASSWORD: ${KEEPALIVED_PASSWORD}
|
||||
KEEPALIVED_VIRTUAL_IPS: ${KEEPALIVED_VIRTUAL_IPS}
|
||||
KEEPALIVED_PASSWORD: "${KEEPALIVED_PASSWORD}"
|
||||
KEEPALIVED_VIRTUAL_IPS: "${KEEPALIVED_VIRTUAL_IPS}"
|
||||
KEEPALIVED_UNICAST_PEERS: "#PYTHON2BASH:['192.168.4.32', '192.168.4.33']"
|
||||
cap_add: [NET_ADMIN, NET_BROADCAST, NET_RAW]
|
||||
networks: [host]
|
||||
@@ -147,7 +147,7 @@ services:
|
||||
order: stop-first
|
||||
|
||||
traefik-certs-dumper:
|
||||
image: ghcr.io/ldez/traefik-certs-dumper:v2.10.0
|
||||
image: ghcr.io/ldez/traefik-certs-dumper:v2.11.4
|
||||
entrypoint: sh -c 'apk add jq ; while ! [ -e /letsencrypt/acme.json ] || ! [ `jq ".[] | .Certificates | length" /letsencrypt/acme.json` != 0 ]; do sleep 1 ; done && traefik-certs-dumper file --version v3 --watch --source /letsencrypt/acme.json --dest /letsencrypt/certs'
|
||||
volumes:
|
||||
- /volume1/docker/letsencrypt:/letsencrypt
|
||||
|
||||
Reference in New Issue
Block a user