Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 831564762b | |||
| 3f177a6993 | |||
| ea4afbd6ca | |||
| 95ec6765c1 | |||
| c40b7d3bc6 | |||
| 525b056b91 | |||
| 6bc11d4c5e | |||
| e0aa51bac3 | |||
| 94d0b989d0 | |||
| 2780b065d2 | |||
| ef691a4308 |
@@ -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:
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
1
helper.txt
Normal file
1
helper.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Error response from daemon: No such container: msp-updater
|
||||||
9
logs.txt
Normal file
9
logs.txt
Normal 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
0
network.txt
Normal file
1390
static/index.html
1390
static/index.html
File diff suppressed because it is too large
Load Diff
@@ -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;
|
||||||
@@ -465,9 +465,9 @@ function renderCustomersTable(data) {
|
|||||||
<div class="btn-group btn-group-sm">
|
<div class="btn-group btn-group-sm">
|
||||||
<button class="btn btn-outline-primary" title="${t('common.view')}" onclick="viewCustomer(${c.id})"><i class="bi bi-eye"></i></button>
|
<button class="btn btn-outline-primary" title="${t('common.view')}" onclick="viewCustomer(${c.id})"><i class="bi bi-eye"></i></button>
|
||||||
${c.deployment && c.deployment.deployment_status === 'running'
|
${c.deployment && c.deployment.deployment_status === 'running'
|
||||||
? `<button class="btn btn-outline-warning" title="${t('common.stop')}" onclick="customerAction(${c.id},'stop')"><i class="bi bi-stop-circle"></i></button>`
|
? `<button class="btn btn-outline-warning" title="${t('common.stop')}" onclick="customerAction(${c.id},'stop')"><i class="bi bi-stop-circle"></i></button>`
|
||||||
: `<button class="btn btn-outline-success" title="${t('common.start')}" onclick="customerAction(${c.id},'start')"><i class="bi bi-play-circle"></i></button>`
|
: `<button class="btn btn-outline-success" title="${t('common.start')}" onclick="customerAction(${c.id},'start')"><i class="bi bi-play-circle"></i></button>`
|
||||||
}
|
}
|
||||||
<button class="btn btn-outline-info" title="${t('common.restart')}" onclick="customerAction(${c.id},'restart')"><i class="bi bi-arrow-repeat"></i></button>
|
<button class="btn btn-outline-info" title="${t('common.restart')}" onclick="customerAction(${c.id},'restart')"><i class="bi bi-arrow-repeat"></i></button>
|
||||||
<button class="btn btn-outline-danger" title="${t('common.delete')}" onclick="showDeleteModal(${c.id},'${esc(c.name)}')"><i class="bi bi-trash"></i></button>
|
<button class="btn btn-outline-danger" title="${t('common.delete')}" onclick="showDeleteModal(${c.id},'${esc(c.name)}')"><i class="bi bi-trash"></i></button>
|
||||||
</div>
|
</div>
|
||||||
@@ -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>';
|
||||||
|
|
||||||
@@ -1305,9 +1305,9 @@ async function loadUsers() {
|
|||||||
<td>
|
<td>
|
||||||
<div class="btn-group btn-group-sm">
|
<div class="btn-group btn-group-sm">
|
||||||
${u.is_active
|
${u.is_active
|
||||||
? `<button class="btn btn-outline-warning" title="${t('common.disable')}" onclick="toggleUserActive(${u.id}, false)"><i class="bi bi-pause-circle"></i></button>`
|
? `<button class="btn btn-outline-warning" title="${t('common.disable')}" onclick="toggleUserActive(${u.id}, false)"><i class="bi bi-pause-circle"></i></button>`
|
||||||
: `<button class="btn btn-outline-success" title="${t('common.enable')}" onclick="toggleUserActive(${u.id}, true)"><i class="bi bi-play-circle"></i></button>`
|
: `<button class="btn btn-outline-success" title="${t('common.enable')}" onclick="toggleUserActive(${u.id}, true)"><i class="bi bi-play-circle"></i></button>`
|
||||||
}
|
}
|
||||||
${u.auth_provider === 'local' ? `<button class="btn btn-outline-info" title="${t('common.resetPassword')}" onclick="resetUserPassword(${u.id}, '${esc(u.username)}')"><i class="bi bi-key"></i></button>` : ''}
|
${u.auth_provider === 'local' ? `<button class="btn btn-outline-info" title="${t('common.resetPassword')}" onclick="resetUserPassword(${u.id}, '${esc(u.username)}')"><i class="bi bi-key"></i></button>` : ''}
|
||||||
${u.totp_enabled ? `<button class="btn btn-outline-secondary" title="${t('mfa.resetMfa')}" onclick="resetUserMfa(${u.id}, '${esc(u.username)}')"><i class="bi bi-shield-x"></i></button>` : ''}
|
${u.totp_enabled ? `<button class="btn btn-outline-secondary" title="${t('mfa.resetMfa')}" onclick="resetUserMfa(${u.id}, '${esc(u.username)}')"><i class="bi bi-shield-x"></i></button>` : ''}
|
||||||
<button class="btn btn-outline-danger" title="${t('common.delete')}" onclick="deleteUser(${u.id}, '${esc(u.username)}')"><i class="bi bi-trash"></i></button>
|
<button class="btn btn-outline-danger" title="${t('common.delete')}" onclick="deleteUser(${u.id}, '${esc(u.username)}')"><i class="bi bi-trash"></i></button>
|
||||||
|
|||||||
4
update_helper.txt
Normal file
4
update_helper.txt
Normal 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
|
||||||
Reference in New Issue
Block a user