From 2780b065d2981edd5f2a30cf78770652784ea185 Mon Sep 17 00:00:00 2001 From: Sascha Lustenberger Date: Sun, 22 Feb 2026 15:14:23 +0100 Subject: [PATCH] fix(updater): add force-recreate and logging to helper container --- app/services/update_service.py | 5 ++-- containers.txt | 8 ------ env.txt | 0 helper.txt | 1 + logs.txt | 50 ++++++++++++++++++++++++++++++++++ port.txt | 2 ++ 6 files changed, 56 insertions(+), 10 deletions(-) delete mode 100644 containers.txt create mode 100644 env.txt create mode 100644 helper.txt create mode 100644 logs.txt create mode 100644 port.txt diff --git a/app/services/update_service.py b/app/services/update_service.py index c1fb1e9..e478273 100644 --- a/app/services/update_service.py +++ b/app/services/update_service.py @@ -299,7 +299,7 @@ def trigger_update(config: Any, db_path: str) -> dict: own_image = "netbirdmsp-appliance-netbird-msp-appliance:latest" helper_cmd = [ - "docker", "run", "--rm", "-d", + "docker", "run", "-d", "--name", "msp-updater", "-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", f"{host_source_dir}:{host_source_dir}:ro", @@ -310,7 +310,8 @@ def trigger_update(config: Any, db_path: str) -> dict: "sleep 3 && " "docker compose -p netbirdmsp-appliance " f"-f {host_source_dir}/docker-compose.yml " - "up --no-deps -d netbird-msp-appliance" + "up --force-recreate --no-deps -d netbird-msp-appliance " + f">> {host_source_dir}/app/backups/updater.log 2>&1" ), ] try: diff --git a/containers.txt b/containers.txt deleted file mode 100644 index 3aaa05c..0000000 --- a/containers.txt +++ /dev/null @@ -1,8 +0,0 @@ -f9fa39b8080d_netbird-msp-appliance Created netbirdmsp-appliance-netbird-msp-appliance -netbird-msp-appliance Exited (0) 2 minutes ago 345ba59d123e -netbird-kunde1-caddy Up About an hour caddy:2-alpine -netbird-kunde1-signal Up About an hour netbirdio/signal:latest -netbird-kunde1-dashboard Up About an hour netbirdio/dashboard:latest -netbird-kunde1-relay Up About an hour netbirdio/relay:latest -netbird-kunde1-management Up About an hour netbirdio/management:latest -docker-socket-proxy Up About an hour tecnativa/docker-socket-proxy:latest diff --git a/env.txt b/env.txt new file mode 100644 index 0000000..e69de29 diff --git a/helper.txt b/helper.txt new file mode 100644 index 0000000..a7601a8 --- /dev/null +++ b/helper.txt @@ -0,0 +1 @@ +Error response from daemon: No such container: msp-updater diff --git a/logs.txt b/logs.txt new file mode 100644 index 0000000..265054f --- /dev/null +++ b/logs.txt @@ -0,0 +1,50 @@ +INFO: 127.0.0.1:35822 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:33932 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:50284 - "GET /api/health HTTP/1.1" 200 OK +INFO: 172.18.0.1:49612 - "GET / HTTP/1.1" 200 OK +INFO: 172.18.0.1:49612 - "GET /css/styles.css HTTP/1.1" 304 Not Modified +INFO: 172.18.0.1:49610 - "GET /js/i18n.js HTTP/1.1" 304 Not Modified +INFO: 172.18.0.1:49632 - "GET /js/app.js HTTP/1.1" 200 OK +INFO: 172.18.0.1:49632 - "GET /lang/en.json HTTP/1.1" 200 OK +INFO: 172.18.0.1:49632 - "GET /favicon.ico HTTP/1.1" 404 Not Found +INFO: 172.18.0.1:49610 - "GET /lang/de.json HTTP/1.1" 200 OK +INFO: 172.18.0.1:49610 - "GET /api/settings/branding HTTP/1.1" 200 OK +INFO: 172.18.0.1:49610 - "GET /api/auth/azure/config HTTP/1.1" 200 OK +INFO: 127.0.0.1:59642 - "GET /api/health HTTP/1.1" 200 OK +2026-02-22 13:56:39,498 [WARNING] passlib.handlers.bcrypt: (trapped) error reading bcrypt version +Traceback (most recent call last): + File "/usr/local/lib/python3.11/site-packages/passlib/handlers/bcrypt.py", line 620, in _load_backend_mixin + version = _bcrypt.__about__.__version__ + ^^^^^^^^^^^^^^^^^ +AttributeError: module 'bcrypt' has no attribute '__about__' +2026-02-22 13:56:39,929 [INFO] app.routers.auth: User admin logged in (provider: local). +INFO: 172.18.0.1:36450 - "POST /api/auth/login HTTP/1.1" 200 OK +INFO: 172.18.0.1:36462 - "GET /api/customers?page=1&per_page=25 HTTP/1.1" 200 OK +INFO: 172.18.0.1:36450 - "GET /api/monitoring/status HTTP/1.1" 200 OK +INFO: 127.0.0.1:54154 - "GET /api/health HTTP/1.1" 200 OK +INFO: 172.18.0.1:54490 - "GET /api/settings/system HTTP/1.1" 200 OK +INFO: 172.18.0.1:54490 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK +2026-02-22 13:57:10,815 [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:57:10,822 [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:57512 - "GET /api/settings/version HTTP/1.1" 200 OK +INFO: 127.0.0.1:52478 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:47310 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:47530 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:41918 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:45108 - "GET /api/health HTTP/1.1" 200 OK +2026-02-22 13:59:53,200 [INFO] app.services.update_service: Database backed up to /app/backups/netbird_msp_20260222_135953.db +2026-02-22 13:59:54,630 [INFO] app.services.update_service: git pull succeeded: Already up to date. +2026-02-22 13:59:54,740 [INFO] app.services.update_service: Rebuilding with GIT_TAG=alpha-1.4 GIT_COMMIT=ef691a4 GIT_BRANCH=unstable +2026-02-22 13:59:54,741 [INFO] app.services.update_service: Phase A: building new image … +2026-02-22 14:03:51,162 [INFO] app.services.update_service: Phase A complete — image built successfully. +2026-02-22 14:03:51,242 [INFO] app.services.update_service: Host source directory: /home/sascha/NetBirdMSP-Appliance +2026-02-22 14:03:52,032 [INFO] app.services.update_service: Phase B: updater container started — this container will restart in ~5s. +2026-02-22 14:03:52,033 [INFO] app.routers.settings: Update triggered by admin. +INFO: 172.18.0.1:53362 - "POST /api/settings/update HTTP/1.1" 200 OK +INFO: 172.18.0.1:35312 - "POST /api/settings/update HTTP/1.1" 401 Unauthorized +INFO: 127.0.0.1:35534 - "GET /api/health HTTP/1.1" 200 OK +2026-02-22 14:04:22,366 [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:04:22,376 [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:53602 - "GET /api/settings/version HTTP/1.1" 200 OK +INFO: 127.0.0.1:51374 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:48640 - "GET /api/health HTTP/1.1" 200 OK diff --git a/port.txt b/port.txt new file mode 100644 index 0000000..ddb881a --- /dev/null +++ b/port.txt @@ -0,0 +1,2 @@ +8000/tcp -> 0.0.0.0:8000 +8000/tcp -> [::]:8000