11 Commits

11 changed files with 901 additions and 559 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", "--rm", "-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,7 +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 --no-deps -d netbird-msp-appliance" "up --force-recreate --no-deps -d netbird-msp-appliance"
), ),
] ]
try: try:

View File

@@ -1,8 +1,9 @@
f9fa39b8080d_netbird-msp-appliance Created netbirdmsp-appliance-netbird-msp-appliance NAMES STATUS IMAGE
netbird-msp-appliance Exited (0) 2 minutes ago 345ba59d123e netbird-msp-appliance Up 3 minutes (healthy) netbirdmsp-appliance-netbird-msp-appliance
netbird-kunde1-caddy Up About an hour caddy:2-alpine msp-updater Exited (0) 3 minutes ago netbirdmsp-appliance-netbird-msp-appliance:latest
netbird-kunde1-signal Up About an hour netbirdio/signal:latest netbird-kunde1-caddy Up 2 hours caddy:2-alpine
netbird-kunde1-dashboard Up About an hour netbirdio/dashboard:latest netbird-kunde1-signal Up 2 hours netbirdio/signal:latest
netbird-kunde1-relay Up About an hour netbirdio/relay:latest netbird-kunde1-dashboard Up 2 hours netbirdio/dashboard:latest
netbird-kunde1-management Up About an hour netbirdio/management:latest netbird-kunde1-relay Up 2 hours netbirdio/relay:latest
docker-socket-proxy Up About an hour tecnativa/docker-socket-proxy:latest netbird-kunde1-management Up 2 hours netbirdio/management:latest
docker-socket-proxy Up 2 hours tecnativa/docker-socket-proxy:latest

0
env.txt Normal file
View File

1
helper.txt Normal file
View File

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

9
logs.txt Normal file
View File

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

0
network.txt Normal file
View File

1
out.txt Normal file
View File

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

2
port.txt Normal file
View File

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

File diff suppressed because it is too large Load Diff

View File

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