dbuild 1.8.2: lint compose.yaml whitespace, fix init template, local README.j2 override

Author: ahze

dbuild/__init__.py

@@ -1,4 +1,4 @@
 """dbuild: FreeBSD OCI container image build tool.
 """
 
-VERSION = "1.8.1"
+VERSION = "1.8.2"

dbuild/docs.py

@@ -201,11 +201,16 @@ def generate_manpage(parser: argparse.ArgumentParser) -> str:
 
 
 def _get_jinja_env(base: Path) -> jinja2.Environment | None:
-    """Create Jinja2 environment looking first in .daemonless/templates, then bundled."""
+    """Create Jinja2 environment with override priority:
+    1. repo root (README.j2 alongside Containerfile.j2)
+    2. .daemonless/templates/
+    3. bundled dbuild templates
+    """
     if jinja2 is None:
         return None
 
     search_paths = [
+        base,
         base / ".daemonless" / "templates",
         Path(__file__).parent / "templates",
     ]
@@ -447,13 +452,16 @@ def run(cfg: Config, args: argparse.Namespace) -> int:
         log.error("Could not find dbuild templates.")
         return 1
 
-    # 1. Generate README.md (if docs: manual isn't set)
+    # 1. Generate README.md (if docs: manual isn't set, or if a local README.j2 exists)
     is_manual = (cfg.metadata.docs == "manual" or
                  (isinstance(cfg.metadata.docs, dict) and cfg.metadata.docs.get("manual", False)))
+    has_local_readme_j2 = (base / "README.j2").exists()
 
-    if is_manual:
+    if is_manual and not has_local_readme_j2:
         log.info("Skipping README.md generation (docs: manual)")
     else:
+        if is_manual and has_local_readme_j2:
+            log.info("docs: manual — using local README.j2 override")
         try:
             template = env.get_template("README.j2")
             content = template.render(context, render_mode="github")

dbuild/lint.py

@@ -159,6 +159,21 @@ def lint_repo(repo_path: Path, verbose: bool = False) -> tuple[list[str], list[s
                     " — run dbuild generate on a host with a git remote set"
                 )
 
+    if compose_path.exists():
+        lines = compose_path.read_text().splitlines()
+        for i, line in enumerate(lines, 1):
+            if line != line.rstrip():
+                warnings.append(f"compose.yaml:{i}: trailing whitespace")
+        blank_runs = 0
+        for i, line in enumerate(lines, 1):
+            if line.strip() == "":
+                blank_runs += 1
+                if blank_runs > 1:
+                    warnings.append(f"compose.yaml:{i}: consecutive blank lines")
+                    blank_runs = 0  # report once per run
+            else:
+                blank_runs = 0
+
     readme_path = repo_path / "README.md"
     if readme_path.exists():
         readme_text = readme_path.read_text()

dbuild/templates/compose.yaml

@@ -28,11 +28,11 @@ services:
     image: ghcr.io/daemonless/{{ name }}:latest
     container_name: {{ name }}
     restart: unless-stopped
-    
-    {%- if mlock %}
+{%- if mlock %}
+
     annotations:
       org.freebsd.jail.allow.mlock: "true"
-    {%- endif %}
+{%- endif %}
 
     environment:
       - PUID=1000

docs/dbuild.1

@@ -1,4 +1,4 @@
-.TH DBUILD 1 "2026-04-02" "dbuild 1.8.1" "User Commands"
+.TH DBUILD 1 "2026-04-05" "dbuild 1.8.2" "User Commands"
 .SH NAME
 dbuild \- FreeBSD OCI container image build tool
 .SH SYNOPSIS