9 Commits

8 changed files with 898 additions and 602 deletions

View File

@@ -299,10 +299,10 @@ def trigger_update(config: Any, db_path: str) -> dict:
own_image = "netbirdmsp-appliance-netbird-msp-appliance:latest" own_image = "netbirdmsp-appliance-netbird-msp-appliance:latest"
helper_cmd = [ helper_cmd = [
"docker", "run", "-d", "docker", "run", "--rm", "-d", "--privileged",
"--name", "msp-updater", "--name", "msp-updater",
"-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", "/var/run/docker.sock:/var/run/docker.sock:z",
"-v", f"{host_source_dir}:{host_source_dir}:ro", "-v", f"{host_source_dir}:{host_source_dir}:ro,z",
*env_flags, *env_flags,
own_image, own_image,
"sh", "-c", "sh", "-c",
@@ -310,8 +310,7 @@ def trigger_update(config: Any, db_path: str) -> dict:
"sleep 3 && " "sleep 3 && "
"docker compose -p netbirdmsp-appliance " "docker compose -p netbirdmsp-appliance "
f"-f {host_source_dir}/docker-compose.yml " f"-f {host_source_dir}/docker-compose.yml "
"up --force-recreate --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: try:

9
containers.txt Normal file
View File

@@ -0,0 +1,9 @@
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

View File

@@ -1,50 +1,9 @@
INFO: 127.0.0.1:35822 - "GET /api/health HTTP/1.1" 200 OK INFO: Started server process [1]
INFO: 127.0.0.1:33932 - "GET /api/health HTTP/1.1" 200 OK INFO: Waiting for application startup.
INFO: 127.0.0.1:50284 - "GET /api/health HTTP/1.1" 200 OK 2026-02-22 14:53:59,694 [INFO] app.main: Starting NetBird MSP Appliance...
INFO: 172.18.0.1:49612 - "GET / HTTP/1.1" 200 OK 2026-02-22 14:53:59,744 [INFO] app.main: Database initialized.
INFO: 172.18.0.1:49612 - "GET /css/styles.css HTTP/1.1" 304 Not Modified INFO: Application startup complete.
INFO: 172.18.0.1:49610 - "GET /js/i18n.js HTTP/1.1" 304 Not Modified INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
INFO: 172.18.0.1:49632 - "GET /js/app.js HTTP/1.1" 200 OK INFO: 127.0.0.1:45370 - "GET /api/health HTTP/1.1" 200 OK
INFO: 172.18.0.1:49632 - "GET /lang/en.json HTTP/1.1" 200 OK INFO: 127.0.0.1:57724 - "GET /api/health HTTP/1.1" 200 OK
INFO: 172.18.0.1:49632 - "GET /favicon.ico HTTP/1.1" 404 Not Found INFO: 127.0.0.1:56212 - "GET /api/health HTTP/1.1" 200 OK
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

0
network.txt Normal file
View File

1
out.txt Normal file
View File

@@ -0,0 +1 @@
msp-updater

File diff suppressed because it is too large Load Diff

View File

@@ -366,7 +366,7 @@ function logout() {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${authToken}`, 'Authorization': `Bearer ${authToken}`,
}, },
}).catch(() => {}); }).catch(() => { });
} }
authToken = null; authToken = null;
currentUser = null; currentUser = null;
@@ -511,7 +511,7 @@ function showNewCustomerModal() {
// Update subdomain suffix // Update subdomain suffix
api('GET', '/settings/system').then(cfg => { api('GET', '/settings/system').then(cfg => {
document.getElementById('cust-subdomain-suffix').textContent = `.${cfg.base_domain || 'domain.com'}`; document.getElementById('cust-subdomain-suffix').textContent = `.${cfg.base_domain || 'domain.com'}`;
}).catch(() => {}); }).catch(() => { });
const modalEl = document.getElementById('customer-modal'); const modalEl = document.getElementById('customer-modal');
const modal = bootstrap.Modal.getOrCreateInstance(modalEl); const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
@@ -1219,12 +1219,12 @@ async function loadVersionInfo() {
let html = `<div class="row g-3"> let html = `<div class="row g-3">
<div class="col-md-6"> <div class="col-md-6">
<div class="border rounded p-3"> <div class="border rounded p-3 h-100">
<div class="text-muted small mb-1">${t('settings.currentVersion')}</div> <div class="text-muted small mb-1">${t('settings.currentVersion')}</div>
<div class="fw-bold fs-5">${esc(currentTag || currentCommit)}</div> <div class="fw-bold fs-5">${esc(currentTag || currentCommit)}</div>
${currentTag ? `<div class="text-muted small font-monospace">${t('settings.commitHash')}: ${esc(currentCommit)}</div>` : ''} ${currentTag ? `<div class="text-muted small font-monospace">${t('settings.commitHash')}: ${esc(currentCommit)}</div>` : ''}
<div class="text-muted small">${t('settings.branch')}: <strong>${esc(current.branch || 'unknown')}</strong></div> <div class="text-muted small">${t('settings.branch')}: <strong>${esc(current.branch || 'unknown')}</strong></div>
<div class="text-muted small">${esc(current.date || '')}</div> <div class="text-muted small mt-2"><i class="bi bi-clock me-1"></i>${formatDate(current.date)}</div>
</div> </div>
</div>`; </div>`;
@@ -1235,17 +1235,17 @@ async function loadVersionInfo() {
? `<span class="badge bg-warning text-dark ms-1">${t('settings.updateAvailable')}</span>` ? `<span class="badge bg-warning text-dark ms-1">${t('settings.updateAvailable')}</span>`
: `<span class="badge bg-success ms-1">${t('settings.upToDate')}</span>`; : `<span class="badge bg-success ms-1">${t('settings.upToDate')}</span>`;
html += `<div class="col-md-6"> html += `<div class="col-md-6">
<div class="border rounded p-3 ${needsUpdate ? 'border-warning' : ''}"> <div class="border rounded p-3 h-100 ${needsUpdate ? 'border-warning' : ''}">
<div class="text-muted small mb-1">${t('settings.latestVersion')} ${badge}</div> <div class="text-muted small mb-1">${t('settings.latestVersion')} ${badge}</div>
<div class="fw-bold fs-5">${esc(latestTag || latestCommit)}</div> <div class="fw-bold fs-5">${esc(latestTag || latestCommit)}</div>
${latestTag ? `<div class="text-muted small font-monospace">${t('settings.commitHash')}: ${esc(latestCommit)}</div>` : ''} ${latestTag ? `<div class="text-muted small font-monospace">${t('settings.commitHash')}: ${esc(latestCommit)}</div>` : ''}
<div class="text-muted small">${t('settings.branch')}: <strong>${esc(latest.branch || 'unknown')}</strong></div> <div class="text-muted small">${t('settings.branch')}: <strong>${esc(latest.branch || 'unknown')}</strong></div>
<div class="text-muted small">${esc(latest.message || '')}</div> <div class="text-muted small mt-2"><i class="bi bi-clock me-1"></i>${formatDate(latest.date)}</div>
<div class="text-muted small">${esc(latest.date || '')}</div> ${latest.message ? `<div class="text-muted small mt-1 border-top pt-1 text-truncate" title="${esc(latest.message)}"><i class="bi bi-chat-text me-1"></i>${esc(latest.message)}</div>` : ''}
</div> </div>
</div>`; </div>`;
} else if (data.error) { } else if (data.error) {
html += `<div class="col-md-6"><div class="alert alert-warning mb-0">${esc(data.error)}</div></div>`; html += `<div class="col-md-6"><div class="alert alert-warning h-100 mb-0">${esc(data.error)}</div></div>`;
} }
html += '</div>'; html += '</div>';

4
update_helper.txt Normal file
View File

@@ -0,0 +1,4 @@
Container netbird-msp-appliance Recreate
Container netbird-msp-appliance Recreated
Container netbird-msp-appliance Starting
Container netbird-msp-appliance Started