7 Commits

8 changed files with 895 additions and 607 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",

View File

@@ -1,8 +1,9 @@
msp-updater Exited (2) 11 seconds ago netbirdmsp-appliance-netbird-msp-appliance:latest 15 seconds ago NAMES STATUS IMAGE
netbird-msp-appliance Up 6 minutes (healthy) 07c60529cf9f 6 minutes ago netbird-msp-appliance Up 3 minutes (healthy) netbirdmsp-appliance-netbird-msp-appliance
netbird-kunde1-caddy Up 2 hours caddy:2-alpine 3 hours ago msp-updater Exited (0) 3 minutes ago netbirdmsp-appliance-netbird-msp-appliance:latest
netbird-kunde1-signal Up 2 hours netbirdio/signal:latest 3 hours ago netbird-kunde1-caddy Up 2 hours caddy:2-alpine
netbird-kunde1-dashboard Up 2 hours netbirdio/dashboard:latest 3 hours ago netbird-kunde1-signal Up 2 hours netbirdio/signal:latest
netbird-kunde1-relay Up 2 hours netbirdio/relay:latest 3 hours ago netbird-kunde1-dashboard Up 2 hours netbirdio/dashboard:latest
netbird-kunde1-management Up 2 hours netbirdio/management:latest 3 hours ago netbird-kunde1-relay Up 2 hours netbirdio/relay:latest
docker-socket-proxy Up 2 hours tecnativa/docker-socket-proxy:latest 3 days ago netbird-kunde1-management Up 2 hours netbirdio/management:latest
docker-socket-proxy Up 2 hours tecnativa/docker-socket-proxy:latest

View File

@@ -1,40 +1,9 @@
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: Application startup complete.
INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit) INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
INFO: 127.0.0.1:60204 - "GET /api/health HTTP/1.1" 200 OK INFO: 127.0.0.1:45370 - "GET /api/health HTTP/1.1" 200 OK
INFO: 127.0.0.1:37702 - "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:34872 - "GET /api/health HTTP/1.1" 200 OK INFO: 127.0.0.1:56212 - "GET /api/health HTTP/1.1" 200 OK
INFO: 127.0.0.1:49808 - "GET /api/health HTTP/1.1" 200 OK
2026-02-22 14:16:10,300 [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:16:10,306 [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:53698 - "GET /api/settings/version HTTP/1.1" 200 OK
2026-02-22 14:16:13,790 [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:16:13,796 [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:53698 - "GET /api/settings/version HTTP/1.1" 200 OK
INFO: 127.0.0.1:55164 - "GET /api/health HTTP/1.1" 200 OK
INFO: 172.18.0.1:55590 - "GET / HTTP/1.1" 200 OK
INFO: 172.18.0.1:55590 - "GET /js/app.js HTTP/1.1" 304 Not Modified
INFO: 172.18.0.1:55590 - "GET /lang/en.json HTTP/1.1" 304 Not Modified
INFO: 172.18.0.1:55590 - "GET /lang/de.json HTTP/1.1" 304 Not Modified
INFO: 172.18.0.1:55590 - "GET /favicon.ico HTTP/1.1" 404 Not Found
INFO: 172.18.0.1:55590 - "GET /api/settings/branding HTTP/1.1" 200 OK
INFO: 172.18.0.1:55590 - "GET /api/auth/azure/config HTTP/1.1" 200 OK
INFO: 172.18.0.1:55590 - "GET /api/auth/me HTTP/1.1" 200 OK
INFO: 172.18.0.1:55590 - "GET /api/monitoring/status HTTP/1.1" 200 OK
INFO: 172.18.0.1:55588 - "GET /api/customers?page=1&per_page=25 HTTP/1.1" 200 OK
INFO: 172.18.0.1:37544 - "GET /api/settings/system HTTP/1.1" 200 OK
INFO: 172.18.0.1:37544 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
2026-02-22 14:16:58,896 [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:16:58,906 [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:37552 - "GET /api/settings/version HTTP/1.1" 200 OK
INFO: 127.0.0.1:57972 - "GET /api/health HTTP/1.1" 200 OK
INFO: 127.0.0.1:59030 - "GET /api/health HTTP/1.1" 200 OK
2026-02-22 14:17:44,793 [INFO] app.services.update_service: Database backed up to /app/backups/netbird_msp_20260222_141744.db
2026-02-22 14:17:45,142 [INFO] app.services.update_service: git pull succeeded: Already up to date.
2026-02-22 14:17:45,160 [INFO] app.services.update_service: Rebuilding with GIT_TAG=alpha-1.5 GIT_COMMIT=94d0b98 GIT_BRANCH=unstable
2026-02-22 14:17:45,160 [INFO] app.services.update_service: Phase A: building new image …
2026-02-22 14:20:39,486 [INFO] app.services.update_service: Phase A complete — image built successfully.
2026-02-22 14:20:39,507 [INFO] app.services.update_service: Host source directory: /home/sascha/NetBirdMSP-Appliance
2026-02-22 14:20:40,068 [INFO] app.services.update_service: Phase B: updater container started — this container will restart in ~5s.
2026-02-22 14:20:40,069 [INFO] app.routers.settings: Update triggered by admin.
INFO: 172.18.0.1:51826 - "POST /api/settings/update HTTP/1.1" 200 OK
INFO: 127.0.0.1:36054 - "GET /api/health HTTP/1.1" 200 OK

0
network.txt Normal file
View File

11
out.txt
View File

@@ -1,10 +1 @@
[unstable 94d0b98] alpha-1.5: trigger update msp-updater
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
2780b06..94d0b98 unstable -> unstable
* [new tag] alpha-1.5 -> alpha-1.5

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>';

View File

@@ -1 +1,4 @@
sh: 1: cannot create /home/sascha/NetBirdMSP-Appliance/app/backups/updater.log: Directory nonexistent Container netbird-msp-appliance Recreate
Container netbird-msp-appliance Recreated
Container netbird-msp-appliance Starting
Container netbird-msp-appliance Started