Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a26a77dd0a | ||
|
|
9377a94cba | ||
|
|
5770ecae49 | ||
|
|
172f31d7c5 |
@@ -151,6 +151,17 @@ def test_mqtt_sentinel_triggers_update_and_is_consumed(env):
|
|||||||
assert "evil" not in calls and "rm -rf" not in calls
|
assert "evil" not in calls and "rm -rf" not in calls
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_prunes_build_cache_and_stale_images_after_up(env):
|
||||||
|
# node-26#41: the build cache was never pruned and filled node-002's disk.
|
||||||
|
(env["stub"] / "response").write_text(json.dumps({"update_requested_at": "2026-10-04T12:00:00+00:00"}))
|
||||||
|
assert _run(env).returncode == 0
|
||||||
|
lines = _calls(env).splitlines()
|
||||||
|
up = next(i for i, ln in enumerate(lines) if ln.startswith("docker compose up -d"))
|
||||||
|
builder = next(i for i, ln in enumerate(lines) if ln.startswith("docker builder prune -af --filter until="))
|
||||||
|
images = next(i for i, ln in enumerate(lines) if ln.startswith("docker image prune -af --filter until="))
|
||||||
|
assert up < builder and up < images # only after the new containers are running
|
||||||
|
|
||||||
|
|
||||||
def test_c2_response_is_never_used_as_a_ref_or_command(env):
|
def test_c2_response_is_never_used_as_a_ref_or_command(env):
|
||||||
(env["stub"] / "response").write_text(json.dumps({"update_requested_at": "$(touch /tmp/pwned); main"}))
|
(env["stub"] / "response").write_text(json.dumps({"update_requested_at": "$(touch /tmp/pwned); main"}))
|
||||||
r = _run(env)
|
r = _run(env)
|
||||||
|
|||||||
@@ -51,6 +51,12 @@ main() {
|
|||||||
flock -n 9 || { log "another update is already running"; return 0; }
|
flock -n 9 || { log "another update is already running"; return 0; }
|
||||||
|
|
||||||
cd "$INSTALL_DIR"
|
cd "$INSTALL_DIR"
|
||||||
|
# This runs as root, but a pre-install.sh checkout (e.g. /home/pi/node-26)
|
||||||
|
# is owned by the login user, and git >= 2.35.2 then refuses every command
|
||||||
|
# with "dubious ownership" — which surfaced as origin '' != REPO_URL. Trust
|
||||||
|
# exactly the configured INSTALL_DIR, for this process only (env config is
|
||||||
|
# command-line scope, which safe.directory honours; no global config change).
|
||||||
|
export GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=safe.directory GIT_CONFIG_VALUE_0="$INSTALL_DIR"
|
||||||
envget() { grep -E "^$1=" .env 2>/dev/null | head -1 | cut -d= -f2- | tr -d '"' || true; }
|
envget() { grep -E "^$1=" .env 2>/dev/null | head -1 | cut -d= -f2- | tr -d '"' || true; }
|
||||||
local NODE_ID C2_URL
|
local NODE_ID C2_URL
|
||||||
NODE_ID="$(envget NODE_ID)"; C2_URL="$(envget C2_URL)"; C2_URL="${C2_URL%/}"
|
NODE_ID="$(envget NODE_ID)"; C2_URL="$(envget C2_URL)"; C2_URL="${C2_URL%/}"
|
||||||
@@ -219,6 +225,14 @@ do_update() {
|
|||||||
done || true
|
done || true
|
||||||
fi
|
fi
|
||||||
docker image prune -f >/dev/null 2>&1 || true
|
docker image prune -f >/dev/null 2>&1 || true
|
||||||
|
|
||||||
|
# node-26#41: neither of the above ever freed BuildKit cache or untagged-
|
||||||
|
# but-unused images, so a BUILD=1 node grew ~40 GB of build cache plus
|
||||||
|
# 16 GB of stale images until the root disk hit 100% and recording silently
|
||||||
|
# stopped (node-002, 17 days). Both prunes skip anything a container uses;
|
||||||
|
# the age filters keep the cache warm for the next build.
|
||||||
|
docker builder prune -af --filter until=72h >/dev/null 2>&1 || true
|
||||||
|
docker image prune -af --filter until=168h >/dev/null 2>&1 || true
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user