fix: trigger_update setzt GIT_TAG/GIT_COMMIT env vars für docker compose rebuild

app/services/update_service.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+import os
 import shutil
 import subprocess
 from datetime import datetime
@@ -198,16 +199,52 @@ def trigger_update(config: Any, db_path: str) -> dict:
 
     logger.info("git pull succeeded: %s", result.stdout.strip()[:200])
 
-    # 4. Fire-and-forget docker compose rebuild — the container will restart itself
+    # 4. Read version info from the freshly-pulled source
+    build_env = os.environ.copy()
+    try:
+        build_env["GIT_COMMIT"] = subprocess.run(
+            ["git", "-C", SOURCE_DIR, "rev-parse", "--short", "HEAD"],
+            capture_output=True, text=True, timeout=10,
+        ).stdout.strip() or "unknown"
+
+        build_env["GIT_BRANCH"] = subprocess.run(
+            ["git", "-C", SOURCE_DIR, "rev-parse", "--abbrev-ref", "HEAD"],
+            capture_output=True, text=True, timeout=10,
+        ).stdout.strip() or "unknown"
+
+        build_env["GIT_COMMIT_DATE"] = subprocess.run(
+            ["git", "-C", SOURCE_DIR, "log", "-1", "--format=%cI"],
+            capture_output=True, text=True, timeout=10,
+        ).stdout.strip() or "unknown"
+
+        tag_result = subprocess.run(
+            ["git", "-C", SOURCE_DIR, "describe", "--tags", "--abbrev=0"],
+            capture_output=True, text=True, timeout=10,
+        )
+        build_env["GIT_TAG"] = tag_result.stdout.strip() if tag_result.returncode == 0 else "unknown"
+    except Exception as exc:
+        logger.warning("Could not read version info from source: %s", exc)
+
+    logger.info(
+        "Rebuilding with GIT_TAG=%s GIT_COMMIT=%s GIT_BRANCH=%s",
+        build_env.get("GIT_TAG", "?"),
+        build_env.get("GIT_COMMIT", "?"),
+        build_env.get("GIT_BRANCH", "?"),
+    )
+
+    # 5. Fire-and-forget docker compose rebuild — the container will restart itself
     compose_cmd = [
         "docker", "compose",
         "-f", f"{SOURCE_DIR}/docker-compose.yml",
         "up", "--build", "-d",
     ]
+    log_path = Path(BACKUP_DIR) / "update_rebuild.log"
+    log_file = open(log_path, "w")
     subprocess.Popen(
         compose_cmd,
-        stdout=subprocess.DEVNULL,
+        stdout=log_file,
-        stderr=subprocess.DEVNULL,
+        stderr=log_file,
+        env=build_env,
     )
     logger.info("docker compose up --build -d triggered — container will restart shortly.")
 

dockerlogs.txt

@@ -0,0 +1,50 @@
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:27:28,812 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:28,818 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:27:29,463 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:29,473 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:27:33,352 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:33,358 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:27:34,899 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:34,905 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/monitoring/resources HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/monitoring/customers HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/monitoring/customers HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/monitoring/resources HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
+2026-02-22 13:27:49,427 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:49,433 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET / HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/settings/branding HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/auth/azure/config HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/auth/me HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/monitoring/status HTTP/1.1" 200 OK
+INFO:     172.18.0.1:45440 - "GET /api/customers?page=1&per_page=25 HTTP/1.1" 200 OK
+INFO:     127.0.0.1:35528 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
+INFO:     172.18.0.1:38946 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
+2026-02-22 13:27:56,795 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:56,802 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:27:59,507 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:27:59,514 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
+2026-02-22 13:28:09,172 [INFO] app.services.update_service: Database backed up to /app/backups/netbird_msp_20260222_132809.db
+2026-02-22 13:28:09,264 [INFO] app.services.update_service: git pull succeeded: Already up to date.
+2026-02-22 13:28:09,265 [INFO] app.services.update_service: docker compose up --build -d triggered — container will restart shortly.
+2026-02-22 13:28:09,265 [INFO] app.routers.settings: Update triggered by admin.
+INFO:     172.18.0.1:57990 - "POST /api/settings/update HTTP/1.1" 200 OK
+INFO:     127.0.0.1:51474 - "GET /api/health HTTP/1.1" 200 OK
+2026-02-22 13:28:49,056 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/branches/unstable "HTTP/1.1 200 OK"
+2026-02-22 13:28:49,062 [INFO] httpx: HTTP Request: GET https://git.0x26.ch/api/v1/repos/BurgerGames/NetBirdMSP-Appliance/tags?limit=1 "HTTP/1.1 200 OK"
+INFO:     172.18.0.1:44506 - "GET /api/settings/version HTTP/1.1" 200 OK
+INFO:     127.0.0.1:53966 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:35452 - "GET /api/health HTTP/1.1" 200 OK

static/index.html

@@ -18,6 +18,7 @@
                         <div id="login-logo"><i class="bi bi-hdd-network fs-1 text-primary"></i></div>
                         <h3 class="mt-2" id="login-title">NetBird MSP Appliance</h3>
                         <p class="text-muted" id="login-subtitle" data-i18n="login.subtitle">Multi-Tenant Management Platform</p>
+                        <p class="text-muted small mb-0" style="opacity:0.6;"><i class="bi bi-tag me-1"></i>alpha-1.1</p>
                     </div>
                     <div id="login-error" class="alert alert-danger d-none"></div>
                     <form id="login-form">