mirror of
https://github.com/kevinveenbirkenbach/docker-volume-backup.git
synced 2026-08-20 13:12:48 +00:00
Kevin Veen-Birkenbach
2129c5e362
ruff was never wired into this repository: no target, no CI step, no pin. It reported 45 findings across sources and tests, so nothing enforced what the codebase already mostly followed. Adds `make ruff` (check + format --check), `make ruff-fix`, and `make lint` as its alias, and makes `make test` run lint as a fourth parallel spur. The CI workflow calls `make test`, so it is covered there too. The linter is pinned in a `lint` extra: a ruff minor bump changes which rules fire, and with the suite gating on a clean run an unpinned linter would fail it on an unrelated day. The 45 findings are fixed rather than configured away. Three needed a decision instead of the mechanical fix: - The generation timestamp keeps its local wall clock (DTZ005 waived). Generations sort by that name, and UTC would order new ones before the existing ones wherever the offset is positive - "newest generation" is what every restore path selects on. - The per-volume `copy` closure now binds volume_name and vol_dir as default arguments (B023). It only worked because it is called inside the same iteration. - The two CLI top-level handlers keep their blind except (BLE001 waived): turning any failure into exit 1 is what a CLI boundary is for. The two in run.py did not need it and were narrowed to what they actually catch. Also drops the comments that restate the code: the section banners in restore/__main__.py, the filename repeated as line 1 of nine test files, step narration above the statement it narrates, and a block in app.py documenting parameters that had moved to another module. What names a trip-wire stays - the snapshot destination rule, the mysql-binary absence in MariaDB 11 images, the session-scoped FOREIGN_KEY_CHECKS, the spooled temp file for multi-GB dumps, and the negative control that loses its discriminating power if it ever passes. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
115 lines
3.4 KiB
Python
115 lines
3.4 KiB
Python
"""Fixtures and paths the e2e suite builds its scenarios from."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import shutil
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
from .process import machine_hash, run
|
|
|
|
# postgres 18+ mounts at /var/lib/postgresql, not /var/lib/postgresql/data.
|
|
POSTGRES_IMAGE = "postgres:alpine"
|
|
POSTGRES_DATA_DIR = "/var/lib/postgresql"
|
|
MARIADB_IMAGE = "mariadb:latest"
|
|
MARIADB_DATA_DIR = "/var/lib/mysql"
|
|
|
|
|
|
def backup_run(
|
|
*,
|
|
backups_dir: str,
|
|
repo_name: str,
|
|
compose_dir: str,
|
|
databases_csv: str,
|
|
database_containers: list[str],
|
|
images_no_stop_required: list[str],
|
|
images_no_backup_required: list[str] | None = None,
|
|
dump_only_sql: bool = False,
|
|
) -> None:
|
|
cmd = [
|
|
"baudolo",
|
|
"--compose-dir",
|
|
compose_dir,
|
|
"--hard-restart-projects",
|
|
"mailu",
|
|
"--repo-name",
|
|
repo_name,
|
|
"--databases-csv",
|
|
databases_csv,
|
|
"--backups-dir",
|
|
backups_dir,
|
|
"--database-containers",
|
|
*database_containers,
|
|
"--images-no-stop-required",
|
|
*images_no_stop_required,
|
|
]
|
|
if images_no_backup_required:
|
|
cmd += ["--images-no-backup-required", *images_no_backup_required]
|
|
if dump_only_sql:
|
|
cmd += ["--dump-only-sql"]
|
|
|
|
try:
|
|
run(cmd, capture=True, check=True)
|
|
except subprocess.CalledProcessError as e:
|
|
print(">>> baudolo failed (exit code:", e.returncode, ")")
|
|
if e.stdout:
|
|
print(">>> baudolo STDOUT:\n" + e.stdout)
|
|
if e.stderr:
|
|
print(">>> baudolo STDERR:\n" + e.stderr)
|
|
raise
|
|
|
|
|
|
def latest_version_dir(backups_dir: str, repo_name: str) -> tuple[str, str]:
|
|
"""
|
|
Returns (hash, version) for the latest backup.
|
|
"""
|
|
h = machine_hash()
|
|
root = Path(backups_dir) / h / repo_name
|
|
if not root.is_dir():
|
|
raise FileNotFoundError(str(root))
|
|
|
|
versions = sorted([p.name for p in root.iterdir() if p.is_dir()])
|
|
if not versions:
|
|
raise RuntimeError(f"No versions found under {root}")
|
|
return h, versions[-1]
|
|
|
|
|
|
def backup_path(backups_dir: str, repo_name: str, version: str, volume: str) -> Path:
|
|
h = machine_hash()
|
|
return Path(backups_dir) / h / repo_name / version / volume
|
|
|
|
|
|
def create_minimal_compose_dir(base: str) -> str:
|
|
"""
|
|
baudolo requires --compose-dir. Create an empty dir with one non-compose subdir.
|
|
"""
|
|
p = Path(base) / "compose-root"
|
|
p.mkdir(parents=True, exist_ok=True)
|
|
(p / "noop").mkdir(parents=True, exist_ok=True)
|
|
return str(p)
|
|
|
|
|
|
def write_databases_csv(path: str, rows: list[tuple[str, str, str, str]]) -> None:
|
|
"""
|
|
rows: (instance, database, username, password)
|
|
database may be '' (empty) to trigger pg_dumpall behavior if you want, but here we use db name.
|
|
"""
|
|
Path(path).parent.mkdir(parents=True, exist_ok=True)
|
|
with open(path, "w", encoding="utf-8") as f:
|
|
f.write("instance;database;username;password\n")
|
|
f.writelines(f"{inst};{db};{user};{pw}\n" for inst, db, user, pw in rows)
|
|
|
|
|
|
def cleanup_docker(*, containers: list[str], volumes: list[str]) -> None:
|
|
for c in containers:
|
|
run(["docker", "rm", "-f", c], capture=True, check=False)
|
|
for v in volumes:
|
|
run(["docker", "volume", "rm", "-f", v], capture=True, check=False)
|
|
|
|
|
|
def ensure_empty_dir(path: str) -> None:
|
|
p = Path(path)
|
|
if p.exists():
|
|
shutil.rmtree(p)
|
|
p.mkdir(parents=True, exist_ok=True)
|