alpha-1.8: final test with privileged

app/services/update_service.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+import os
 import shutil
 import subprocess
 from datetime import datetime
@@ -198,18 +199,143 @@ 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
-    compose_cmd = [
+    build_env = os.environ.copy()
-        "docker", "compose",
+    try:
-        "-f", f"{SOURCE_DIR}/docker-compose.yml",
+        build_env["GIT_COMMIT"] = subprocess.run(
-        "up", "--build", "-d",
+            ["git", "-C", SOURCE_DIR, "rev-parse", "--short", "HEAD"],
-    ]
+            capture_output=True, text=True, timeout=10,
-    subprocess.Popen(
+        ).stdout.strip() or "unknown"
-        compose_cmd,
+
-        stdout=subprocess.DEVNULL,
+        build_env["GIT_BRANCH"] = subprocess.run(
-        stderr=subprocess.DEVNULL,
+            ["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", "?"),
     )
-    logger.info("docker compose up --build -d triggered — container will restart shortly.")
+
+    # 5. Two-phase rebuild: Build image first, then swap container.
+    #    The swap will kill this process (we ARE the container), so we must
+    #    ensure the compose-up runs detached on the Docker host via a wrapper.
+    log_path = Path(BACKUP_DIR) / "update_rebuild.log"
+
+    # Phase A — build the new image (does NOT stop anything)
+    build_cmd = [
+        "docker", "compose",
+        "-p", "netbirdmsp-appliance",
+        "-f", f"{SOURCE_DIR}/docker-compose.yml",
+        "build", "--no-cache",
+        "netbird-msp-appliance",
+    ]
+    logger.info("Phase A: building new image …")
+    try:
+        build_result = subprocess.run(
+            build_cmd,
+            capture_output=True, text=True,
+            timeout=600,
+            env=build_env,
+        )
+        with open(log_path, "w") as f:
+            f.write(build_result.stdout)
+            f.write(build_result.stderr)
+        if build_result.returncode != 0:
+            logger.error("Image build failed: %s", build_result.stderr[:500])
+            return {
+                "ok": False,
+                "message": f"Image build failed: {build_result.stderr[:300]}",
+                "backup": backup_path,
+            }
+    except subprocess.TimeoutExpired:
+        return {"ok": False, "message": "Image build timed out after 600s.", "backup": backup_path}
+
+    logger.info("Phase A complete — image built successfully.")
+
+    # Phase B — swap the container using a helper container.
+    #    When compose recreates our container, ALL processes inside die (PID namespace
+    #    is destroyed). So we launch a *separate* helper container via 'docker run -d'
+    #    that has access to the Docker socket and runs 'docker compose up -d'.
+    #    This helper lives outside our container and survives our restart.
+
+    # Discover the host-side path of /app-source (docker volumes use host paths)
+    try:
+        inspect_result = subprocess.run(
+            ["docker", "inspect", "netbird-msp-appliance",
+             "--format", '{{range .Mounts}}{{if eq .Destination "/app-source"}}{{.Source}}{{end}}{{end}}'],
+            capture_output=True, text=True, timeout=10,
+        )
+        host_source_dir = inspect_result.stdout.strip()
+        if not host_source_dir:
+            raise ValueError("Could not find /app-source mount")
+    except Exception as exc:
+        logger.error("Failed to discover host source path: %s", exc)
+        return {"ok": False, "message": f"Could not find host source path: {exc}", "backup": backup_path}
+
+    logger.info("Host source directory: %s", host_source_dir)
+
+    env_flags = []
+    for key in ("GIT_TAG", "GIT_COMMIT", "GIT_BRANCH", "GIT_COMMIT_DATE"):
+        val = build_env.get(key, "unknown")
+        env_flags.extend(["-e", f"{key}={val}"])
+
+    # Use the same image we're already running (it has docker CLI + compose plugin)
+    own_image = "netbirdmsp-appliance-netbird-msp-appliance:latest"
+
+    helper_cmd = [
+        "docker", "run", "-d", "--privileged",
+        "--name", "msp-updater",
+        "-v", "/var/run/docker.sock:/var/run/docker.sock:z",
+        "-v", f"{host_source_dir}:{host_source_dir}:ro,z",
+        *env_flags,
+        own_image,
+        "sh", "-c",
+        (
+            "sleep 3 && "
+            "docker compose -p netbirdmsp-appliance "
+            f"-f {host_source_dir}/docker-compose.yml "
+            "up --force-recreate --no-deps -d netbird-msp-appliance"
+        ),
+    ]
+    try:
+        # Remove stale updater container if any
+        subprocess.run(
+            ["docker", "rm", "-f", "msp-updater"],
+            capture_output=True, timeout=10,
+        )
+        result = subprocess.run(
+            helper_cmd,
+            capture_output=True, text=True,
+            timeout=30,
+            env=build_env,
+        )
+        if result.returncode != 0:
+            logger.error("Failed to start updater container: %s", result.stderr.strip())
+            return {
+                "ok": False,
+                "message": f"Update-Container konnte nicht gestartet werden: {result.stderr.strip()[:200]}",
+                "backup": backup_path,
+            }
+        logger.info("Phase B: updater container started — this container will restart in ~5s.")
+    except Exception as exc:
+        logger.error("Failed to launch updater: %s", exc)
+        return {"ok": False, "message": f"Updater launch failed: {exc}", "backup": backup_path}
 
     return {
         "ok": True,

containers.txt

@@ -0,0 +1,9 @@
+CONTAINER ID   IMAGE                                               COMMAND                  CREATED          STATUS                     PORTS                                                                 NAMES
+b25f16030139   netbirdmsp-appliance-netbird-msp-appliance:latest   "sh -c 'sleep 3 && d…"   2 minutes ago    Exited (1) 2 minutes ago                                                                         msp-updater
+c7acab75017f   f4446ac34896                                        "uvicorn app.main:ap…"   11 minutes ago   Up 11 minutes (healthy)    0.0.0.0:8000->8000/tcp, [::]:8000->8000/tcp                           netbird-msp-appliance
+878efa979680   caddy:2-alpine                                      "caddy run --config …"   3 hours ago      Up 2 hours                 443/tcp, 2019/tcp, 443/udp, 0.0.0.0:9001->80/tcp, [::]:9001->80/tcp   netbird-kunde1-caddy
+564c613f112a   netbirdio/signal:latest                             "/go/bin/netbird-sig…"   3 hours ago      Up 2 hours                                                                                       netbird-kunde1-signal
+a98852970815   netbirdio/dashboard:latest                          "/usr/bin/supervisor…"   3 hours ago      Up 2 hours                 80/tcp, 443/tcp                                                       netbird-kunde1-dashboard
+11e100e21d81   netbirdio/relay:latest                              "/go/bin/netbird-rel…"   3 hours ago      Up 2 hours                 0.0.0.0:3478->3478/udp, [::]:3478->3478/udp                           netbird-kunde1-relay
+aeae96bf691e   netbirdio/management:latest                         "/go/bin/netbird-mgm…"   3 hours ago      Up 2 hours                                                                                       netbird-kunde1-management
+9cdda4d58e36   tecnativa/docker-socket-proxy:latest                "docker-entrypoint.s…"   3 days ago       Up 2 hours                 2375/tcp                                                              docker-socket-proxy

helper.txt

@@ -0,0 +1 @@
+Error response from daemon: No such container: msp-updater

logs.txt

@@ -0,0 +1,30 @@
+INFO:     172.18.0.1:34414 - "GET /lang/de.json HTTP/1.1" 304 Not Modified
+INFO:     172.18.0.1:34414 - "GET /favicon.ico HTTP/1.1" 404 Not Found
+INFO:     172.18.0.1:34424 - "GET /api/settings/branding HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34424 - "GET /api/auth/azure/config HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34424 - "GET /api/auth/me HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34424 - "GET /api/monitoring/status HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34414 - "GET /api/customers?page=1&per_page=25 HTTP/1.1" 200 OK
+INFO:     127.0.0.1:34422 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34042 - "GET /api/settings/system HTTP/1.1" 200 OK
+INFO:     172.18.0.1:34042 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
+2026-02-22 14:40:01,292 [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 14:40:01,301 [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:49812 - "GET /api/settings/version HTTP/1.1" 200 OK
+INFO:     127.0.0.1:54492 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:36052 - "GET /api/health HTTP/1.1" 200 OK
+2026-02-22 14:40:57,656 [INFO] app.services.update_service: Database backed up to /app/backups/netbird_msp_20260222_144057.db
+2026-02-22 14:40:57,971 [INFO] app.services.update_service: git pull succeeded: Already up to date.
+2026-02-22 14:40:57,988 [INFO] app.services.update_service: Rebuilding with GIT_TAG=alpha-1.7 GIT_COMMIT=c40b7d3 GIT_BRANCH=unstable
+2026-02-22 14:40:57,988 [INFO] app.services.update_service: Phase A: building new image …
+2026-02-22 14:42:44,434 [INFO] app.services.update_service: Phase A complete — image built successfully.
+2026-02-22 14:42:44,461 [INFO] app.services.update_service: Host source directory: /home/sascha/NetBirdMSP-Appliance
+2026-02-22 14:42:44,973 [INFO] app.services.update_service: Phase B: updater container started — this container will restart in ~5s.
+2026-02-22 14:42:44,973 [INFO] app.routers.settings: Update triggered by admin.
+INFO:     172.18.0.1:46292 - "POST /api/settings/update HTTP/1.1" 200 OK
+INFO:     127.0.0.1:54584 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:33600 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:35272 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:44226 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:48574 - "GET /api/health HTTP/1.1" 200 OK
+INFO:     127.0.0.1:53686 - "GET /api/health HTTP/1.1" 200 OK

out.txt

@@ -0,0 +1,10 @@
+[unstable c40b7d3] alpha-1.7: final test
+remote: 
+remote: Create a new pull request for 'unstable':        
+remote:   https://git.0x26.ch/BurgerGames/NetBirdMSP-Appliance/pulls/new/unstable        
+remote: 
+remote: .. Processing 2 references        
+remote: Processed 2 references in total        
+To https://git.0x26.ch/BurgerGames/NetBirdMSP-Appliance.git
+   525b056..c40b7d3  unstable -> unstable
+ * [new tag]         alpha-1.7 -> alpha-1.7

port.txt

@@ -0,0 +1,2 @@
+8000/tcp -> 0.0.0.0:8000
+8000/tcp -> [::]:8000

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">

update_helper.txt

@@ -0,0 +1 @@
+unable to get image 'netbirdmsp-appliance-netbird-msp-appliance': permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.51/images/netbirdmsp-appliance-netbird-msp-appliance/json": dial unix /var/run/docker.sock: connect: permission denied