From 3f177a699338ed19345934a84c612b20b2c20c6f Mon Sep 17 00:00:00 2001 From: Sascha Lustenberger Date: Sun, 22 Feb 2026 15:58:18 +0100 Subject: [PATCH] fix(updater): add --rm to helper container to remove it after use --- app/services/update_service.py | 2 +- containers.txt | 18 ++++++++-------- logs.txt | 39 ++++++++-------------------------- out.txt | 11 +--------- update_helper.txt | 5 ++++- 5 files changed, 24 insertions(+), 51 deletions(-) diff --git a/app/services/update_service.py b/app/services/update_service.py index cf762b6..65f38ea 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", "-d", "--privileged", + "docker", "run", "--rm", "-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", diff --git a/containers.txt b/containers.txt index fcfd817..d1222b7 100644 --- a/containers.txt +++ b/containers.txt @@ -1,9 +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 +NAMES STATUS IMAGE +netbird-msp-appliance Up 3 minutes (healthy) netbirdmsp-appliance-netbird-msp-appliance +msp-updater Exited (0) 3 minutes ago netbirdmsp-appliance-netbird-msp-appliance:latest +netbird-kunde1-caddy Up 2 hours caddy:2-alpine +netbird-kunde1-signal Up 2 hours netbirdio/signal:latest +netbird-kunde1-dashboard Up 2 hours netbirdio/dashboard:latest +netbird-kunde1-relay Up 2 hours netbirdio/relay:latest +netbird-kunde1-management Up 2 hours netbirdio/management:latest +docker-socket-proxy Up 2 hours tecnativa/docker-socket-proxy:latest diff --git a/logs.txt b/logs.txt index c9816e5..ce1de1b 100644 --- a/logs.txt +++ b/logs.txt @@ -1,30 +1,9 @@ -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 +INFO: Started server process [1] +INFO: Waiting for application startup. +2026-02-22 14:53:59,694 [INFO] app.main: Starting NetBird MSP Appliance... +2026-02-22 14:53:59,744 [INFO] app.main: Database initialized. +INFO: Application startup complete. +INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit) +INFO: 127.0.0.1:45370 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:57724 - "GET /api/health HTTP/1.1" 200 OK +INFO: 127.0.0.1:56212 - "GET /api/health HTTP/1.1" 200 OK diff --git a/out.txt b/out.txt index 6f81c95..71b00a0 100644 --- a/out.txt +++ b/out.txt @@ -1,10 +1 @@ -[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 +msp-updater diff --git a/update_helper.txt b/update_helper.txt index 6133f48..e19ce6e 100644 --- a/update_helper.txt +++ b/update_helper.txt @@ -1 +1,4 @@ -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 + Container netbird-msp-appliance Recreate + Container netbird-msp-appliance Recreated + Container netbird-msp-appliance Starting + Container netbird-msp-appliance Started