Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0fe68cc6df | |||
| 314393d61a | |||
| a9fc549cec | |||
| 41bbd6676b |
@@ -232,21 +232,110 @@ def trigger_update(config: Any, db_path: str) -> dict:
|
||||
build_env.get("GIT_BRANCH", "?"),
|
||||
)
|
||||
|
||||
# 5. Fire-and-forget docker compose rebuild — the container will restart itself
|
||||
compose_cmd = [
|
||||
"docker", "compose",
|
||||
"-f", f"{SOURCE_DIR}/docker-compose.yml",
|
||||
"up", "--build", "-d",
|
||||
]
|
||||
# 5. Two-phase rebuild: Build image first, then swap container.
|
||||
# The swap will kill this process (we ARE the container), so we must
|
||||
# ensure the compose-up runs detached on the Docker host via a wrapper.
|
||||
log_path = Path(BACKUP_DIR) / "update_rebuild.log"
|
||||
log_file = open(log_path, "w")
|
||||
subprocess.Popen(
|
||||
compose_cmd,
|
||||
stdout=log_file,
|
||||
stderr=log_file,
|
||||
|
||||
# Phase A — build the new image (does NOT stop anything)
|
||||
build_cmd = [
|
||||
"docker", "compose",
|
||||
"-p", "netbirdmsp-appliance",
|
||||
"-f", f"{SOURCE_DIR}/docker-compose.yml",
|
||||
"build", "--no-cache",
|
||||
"netbird-msp-appliance",
|
||||
]
|
||||
logger.info("Phase A: building new image …")
|
||||
try:
|
||||
build_result = subprocess.run(
|
||||
build_cmd,
|
||||
capture_output=True, text=True,
|
||||
timeout=600,
|
||||
env=build_env,
|
||||
)
|
||||
logger.info("docker compose up --build -d triggered — container will restart shortly.")
|
||||
with open(log_path, "w") as f:
|
||||
f.write(build_result.stdout)
|
||||
f.write(build_result.stderr)
|
||||
if build_result.returncode != 0:
|
||||
logger.error("Image build failed: %s", build_result.stderr[:500])
|
||||
return {
|
||||
"ok": False,
|
||||
"message": f"Image build failed: {build_result.stderr[:300]}",
|
||||
"backup": backup_path,
|
||||
}
|
||||
except subprocess.TimeoutExpired:
|
||||
return {"ok": False, "message": "Image build timed out after 600s.", "backup": backup_path}
|
||||
|
||||
logger.info("Phase A complete — image built successfully.")
|
||||
|
||||
# Phase B — swap the container using a helper container.
|
||||
# When compose recreates our container, ALL processes inside die (PID namespace
|
||||
# is destroyed). So we launch a *separate* helper container via 'docker run -d'
|
||||
# that has access to the Docker socket and runs 'docker compose up -d'.
|
||||
# This helper lives outside our container and survives our restart.
|
||||
|
||||
# Discover the host-side path of /app-source (docker volumes use host paths)
|
||||
try:
|
||||
inspect_result = subprocess.run(
|
||||
["docker", "inspect", "netbird-msp-appliance",
|
||||
"--format", '{{range .Mounts}}{{if eq .Destination "/app-source"}}{{.Source}}{{end}}{{end}}'],
|
||||
capture_output=True, text=True, timeout=10,
|
||||
)
|
||||
host_source_dir = inspect_result.stdout.strip()
|
||||
if not host_source_dir:
|
||||
raise ValueError("Could not find /app-source mount")
|
||||
except Exception as exc:
|
||||
logger.error("Failed to discover host source path: %s", exc)
|
||||
return {"ok": False, "message": f"Could not find host source path: {exc}", "backup": backup_path}
|
||||
|
||||
logger.info("Host source directory: %s", host_source_dir)
|
||||
|
||||
env_flags = []
|
||||
for key in ("GIT_TAG", "GIT_COMMIT", "GIT_BRANCH", "GIT_COMMIT_DATE"):
|
||||
val = build_env.get(key, "unknown")
|
||||
env_flags.extend(["-e", f"{key}={val}"])
|
||||
|
||||
# Use the same image we're already running (it has docker CLI + compose plugin)
|
||||
own_image = "netbirdmsp-appliance-netbird-msp-appliance:latest"
|
||||
|
||||
helper_cmd = [
|
||||
"docker", "run", "--rm", "-d",
|
||||
"--name", "msp-updater",
|
||||
"-v", "/var/run/docker.sock:/var/run/docker.sock",
|
||||
"-v", f"{host_source_dir}:{host_source_dir}:ro",
|
||||
*env_flags,
|
||||
own_image,
|
||||
"sh", "-c",
|
||||
(
|
||||
"sleep 3 && "
|
||||
"docker compose -p netbirdmsp-appliance "
|
||||
f"-f {host_source_dir}/docker-compose.yml "
|
||||
"up --no-deps -d netbird-msp-appliance"
|
||||
),
|
||||
]
|
||||
try:
|
||||
# Remove stale updater container if any
|
||||
subprocess.run(
|
||||
["docker", "rm", "-f", "msp-updater"],
|
||||
capture_output=True, timeout=10,
|
||||
)
|
||||
result = subprocess.run(
|
||||
helper_cmd,
|
||||
capture_output=True, text=True,
|
||||
timeout=30,
|
||||
env=build_env,
|
||||
)
|
||||
if result.returncode != 0:
|
||||
logger.error("Failed to start updater container: %s", result.stderr.strip())
|
||||
return {
|
||||
"ok": False,
|
||||
"message": f"Update-Container konnte nicht gestartet werden: {result.stderr.strip()[:200]}",
|
||||
"backup": backup_path,
|
||||
}
|
||||
logger.info("Phase B: updater container started — this container will restart in ~5s.")
|
||||
except Exception as exc:
|
||||
logger.error("Failed to launch updater: %s", exc)
|
||||
return {"ok": False, "message": f"Updater launch failed: {exc}", "backup": backup_path}
|
||||
|
||||
return {
|
||||
"ok": True,
|
||||
|
||||
8
containers.txt
Normal file
8
containers.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
f9fa39b8080d_netbird-msp-appliance Created netbirdmsp-appliance-netbird-msp-appliance
|
||||
netbird-msp-appliance Exited (0) 2 minutes ago 345ba59d123e
|
||||
netbird-kunde1-caddy Up About an hour caddy:2-alpine
|
||||
netbird-kunde1-signal Up About an hour netbirdio/signal:latest
|
||||
netbird-kunde1-dashboard Up About an hour netbirdio/dashboard:latest
|
||||
netbird-kunde1-relay Up About an hour netbirdio/relay:latest
|
||||
netbird-kunde1-management Up About an hour netbirdio/management:latest
|
||||
docker-socket-proxy Up About an hour tecnativa/docker-socket-proxy:latest
|
||||
@@ -1,50 +0,0 @@
|
||||
INFO: 172.18.0.1:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:28,812 [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:27:28,818 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:29,463 [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:27:29,473 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:33,352 [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:27:33,358 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:34,899 [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:27:34,905 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/monitoring/resources HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/monitoring/customers HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/monitoring/customers HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/monitoring/resources HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:49,427 [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:27:49,433 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET / HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/settings/branding HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/auth/azure/config HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/auth/me HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/monitoring/status HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:45440 - "GET /api/customers?page=1&per_page=25 HTTP/1.1" 200 OK
|
||||
INFO: 127.0.0.1:35528 - "GET /api/health HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:33288 - "GET /api/settings/system HTTP/1.1" 200 OK
|
||||
INFO: 172.18.0.1:38946 - "GET /api/auth/mfa/status HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:56,795 [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:27:56,802 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:27:59,507 [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:27:59,514 [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:33288 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
2026-02-22 13:28:09,172 [INFO] app.services.update_service: Database backed up to /app/backups/netbird_msp_20260222_132809.db
|
||||
2026-02-22 13:28:09,264 [INFO] app.services.update_service: git pull succeeded: Already up to date.
|
||||
2026-02-22 13:28:09,265 [INFO] app.services.update_service: docker compose up --build -d triggered — container will restart shortly.
|
||||
2026-02-22 13:28:09,265 [INFO] app.routers.settings: Update triggered by admin.
|
||||
INFO: 172.18.0.1:57990 - "POST /api/settings/update HTTP/1.1" 200 OK
|
||||
INFO: 127.0.0.1:51474 - "GET /api/health HTTP/1.1" 200 OK
|
||||
2026-02-22 13:28:49,056 [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:28:49,062 [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:44506 - "GET /api/settings/version HTTP/1.1" 200 OK
|
||||
INFO: 127.0.0.1:53966 - "GET /api/health HTTP/1.1" 200 OK
|
||||
INFO: 127.0.0.1:35452 - "GET /api/health HTTP/1.1" 200 OK
|
||||
Reference in New Issue
Block a user