installer: Docker Compose v2 not installable on Debian bookworm ARM64 - store apps will silently fail #2991
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ### Fixed | ||
|
|
||
| - Installer: Docker Compose v2 now uses Docker's official apt repository when Debian bookworm ARM64 lacks distro Compose packages, and installer and UI health checks report Compose failures loudly. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -147,7 +147,7 @@ echo "test: trixie fallback installs docker-ce + plugin from Docker's repo" | |
| grep -q "docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin" "$SCRIPT" | ||
|
|
||
| echo "test: trixie fallback is gated on the missing-package rc==2, not on a generic failure" | ||
| grep -A 15 "_install_compose_v2" "$SCRIPT" \ | ||
|
There was a problem hiding this comment. WARNING: Test at line 159 searches for The change from Reply with |
||
| | grep -q "_apt_compose_rc == 2" | ||
|
|
||
| echo "test: trixie fallback does NOT trigger on a generic install failure" | ||
|
|
@@ -224,6 +224,11 @@ grep -A4 'Docker apt key fingerprint mismatch' "$SCRIPT" \ | |
| echo "test: ensure_docker_for_apps call site tolerates fallback failure (no set -e abort)" | ||
| ensure_docker_call_line=$(grep -n "ensure_docker_for_apps || warn" "$SCRIPT" | head -1 | cut -d: -f1) | ||
| (( ensure_docker_call_line > 0 )) | ||
|
|
||
| echo "test: Compose v2 failure is tracked for the installer summary" | ||
| grep -q 'DOCKER_COMPOSE_STATUS="unavailable"' "$SCRIPT" | ||
| grep -q 'Docker Compose v2: UNAVAILABLE' "$SCRIPT" | ||
|
|
||
| # ── Controller readiness wait (taOS#2) ───────────────────────────────── | ||
|
|
||
| echo "test: controller wait uses a 240 s ready timeout" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,6 +118,89 @@ def _extract_func(name: str) -> str: | |
| """ | ||
|
|
||
|
|
||
| def _run_preexisting_docker_compose_path(tmp_path): | ||
|
There was a problem hiding this comment. SUGGESTION: Test not hermetic w.r.t.
Reply with |
||
| script = "\n".join([ | ||
| "set -euo pipefail", | ||
| "log() { printf '[log] %s\\n' \"$*\" >&2; }", | ||
| "warn() { printf '[warn] %s\\n' \"$*\" >&2; }", | ||
| "sudo() {", | ||
| " while [[ $# -gt 0 ]]; do", | ||
| " case \"$1\" in", | ||
| " [A-Z_]*=*) shift; continue ;;", | ||
| " esac", | ||
| " break", | ||
| " done", | ||
| " \"$@\"", | ||
| "}", | ||
| "uname() { echo Linux; }", | ||
| "apt-cache() { return 1; }", | ||
| "apt-get() { return 0; }", | ||
| "systemctl() { return 0; }", | ||
| "compose_available=0", | ||
| "OFFICIAL_REPO_CALLED=0", | ||
| "docker() {", | ||
| " case \"${1:-}\" in", | ||
| " --version) echo 'Docker version 27.0.0' ;;", | ||
| " info) return 0 ;;", | ||
| " compose)", | ||
| " if [[ \"${2:-}\" == version && \"$compose_available\" == 1 ]]; then", | ||
| " echo 'Docker Compose version v2.30.0'", | ||
| " return 0", | ||
| " fi", | ||
| " echo \"docker: 'compose' is not a docker command\" >&2", | ||
| " return 1", | ||
| " ;;", | ||
| " esac", | ||
| "}", | ||
| "_docker_running() { sudo docker info; }", | ||
| _extract_func("_apt_install_compose"), | ||
| _extract_func("_install_compose_v2"), | ||
| _extract_func("ensure_docker_for_apps"), | ||
| "_apt_install_docker_official_repo() {", | ||
| " OFFICIAL_REPO_CALLED=1", | ||
| " compose_available=1", | ||
| "}", | ||
| "ensure_rc=0", | ||
| "ensure_docker_for_apps || ensure_rc=$?", | ||
| "compose_rc=0", | ||
| "docker compose version >/dev/null 2>&1 || compose_rc=$?", | ||
| "printf 'ensure_rc=%s official_repo_called=%s compose_rc=%s\\n' \\", | ||
| " \"$ensure_rc\" \"$OFFICIAL_REPO_CALLED\" \"$compose_rc\"", | ||
| ]) | ||
| proc = subprocess.run( | ||
| ["bash", "-c", script], | ||
| capture_output=True, | ||
| text=True, | ||
| env={**os.environ, "USER": "root", "SUDO_USER": "root", "arch": "aarch64"}, | ||
| timeout=30, | ||
| ) | ||
| assert "ensure_rc=" in proc.stdout, ( | ||
| f"ensure_docker_for_apps never completed.\nstdout={proc.stdout}\nstderr={proc.stderr}" | ||
| ) | ||
| values = dict( | ||
| item.split("=", 1) | ||
| for item in proc.stdout.strip().split() | ||
| if "=" in item | ||
| ) | ||
| return proc, {key: int(value) for key, value in values.items()} | ||
|
|
||
|
|
||
| @pytest.mark.skipif(os.name != "posix", reason="bash-only test") | ||
| def test_bookworm_arm64_preexisting_docker_gets_compose_from_official_repo(tmp_path): | ||
| proc, values = _run_preexisting_docker_compose_path(tmp_path) | ||
|
|
||
| assert proc.returncode == 0, f"wrapper failed: {proc.stderr}" | ||
| assert values["ensure_rc"] == 0, f"installer Docker setup failed: {proc.stderr}" | ||
| assert values["official_repo_called"] == 1, ( | ||
| "a pre-existing Docker install with no distro Compose package must use " | ||
| f"Docker's official repo fallback; stdout={proc.stdout!r} stderr={proc.stderr!r}" | ||
| ) | ||
| assert values["compose_rc"] == 0, ( | ||
| "bookworm ARM64-shaped path left 'docker compose' unavailable; " | ||
| f"stdout={proc.stdout!r} stderr={proc.stderr!r}" | ||
| ) | ||
|
|
||
|
|
||
| def _run_fallback( | ||
| tmp_path, | ||
| *, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import pytest | ||
| from unittest.mock import AsyncMock, patch | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
|
|
@@ -9,6 +10,22 @@ async def test_health_returns_ok(self, client): | |
| data = resp.json() | ||
| assert "status" in data | ||
|
|
||
| async def test_health_check_surfaces_docker_compose(self, client): | ||
| compose_check = AsyncMock( | ||
| return_value={ | ||
| "status": "error", | ||
| "detail": "docker: 'compose' is not a docker command", | ||
| } | ||
| ) | ||
| with patch("tinyagentos.routes.dashboard._check_docker_compose", compose_check): | ||
| resp = await client.get("/api/health-check") | ||
|
|
||
| assert resp.status_code == 200 | ||
| compose = next(check for check in resp.json()["checks"] if check["name"] == "Docker Compose v2") | ||
| assert compose["status"] == "error" | ||
| assert compose["detail"] == "docker: 'compose' is not a docker command" | ||
| compose_check.assert_awaited_once_with() | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
| class TestDashboardPage: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -291,6 +291,24 @@ async def _check_docker() -> dict: | |
| return {"status": "error", "detail": str(e)} | ||
|
|
||
|
|
||
| async def _check_docker_compose() -> dict: | ||
| """Check the Docker Compose v2 plugin used by Store apps.""" | ||
| try: | ||
| proc = await asyncio.create_subprocess_exec( | ||
| "docker", "compose", "version", | ||
| stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, | ||
| ) | ||
| stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=5) | ||
|
There was a problem hiding this comment. 🩺 Stability & Availability | 🟠 Major | ⚡ Quick win 🔎 Supported by static analysis🏁 Script executed: #!/bin/bash
set -euo pipefail
# Resolve the repository-declared Python target before using its interpreter.
fd -a -t f 'pyproject.toml' '.python-version' 'tox.ini' 'setup.cfg' | while IFS= read -r file; do
echo "== $file =="
rg -n 'requires-python|python_requires|python_version|target-version' "$file" || true
done
# With that declared interpreter, verify that timing out communicate() leaves
# the child alive until the caller explicitly terminates it.
python - <<'PY'
import asyncio
async def probe():
proc = await asyncio.create_subprocess_exec("sleep", "30")
try:
await asyncio.wait_for(proc.communicate(), timeout=0.01)
except asyncio.TimeoutError:
print(f"returncode_after_timeout={proc.returncode!r}")
proc.kill()
await proc.communicate()
asyncio.run(probe())
PYRepository: jaylfc/taOS Length of output: 362 🏁 Script executed: #!/bin/bash
set -euo pipefail
printf '%s\n' '== candidate files =='
fd -a -t f 'dashboard.py|pyproject.toml|.python-version|tox.ini|setup.cfg' . || true
printf '%s\n' '== dashboard.py outline =='
ast-grep outline tinyagentos/routes/dashboard.py
printf '%s\n' '== relevant source =='
sed -n '260,325p' tinyagentos/routes/dashboard.py
printf '%s\n' '== subprocess and timeout bindings =='
rg -n -C 3 'create_subprocess|communicate|wait_for|TimeoutError|docker compose' tinyagentos/routes/dashboard.pyRepository: jaylfc/taOS Length of output: 6523 🏁 Script executed: #!/bin/bash
set -euo pipefail
printf '%s\n' '== declared Python target =='
rg -n -C 2 'requires-python|python_requires|python_version|target-version' pyproject.toml || true
printf '%s\n' '== timeout behavior probe =='
python3 - <<'PY'
import asyncio
async def probe():
proc = await asyncio.create_subprocess_exec(
"sleep", "30",
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
)
try:
await asyncio.wait_for(proc.communicate(), timeout=0.01)
except asyncio.TimeoutError:
print(f"returncode_after_timeout={proc.returncode!r}")
proc.kill()
await proc.communicate()
asyncio.run(probe())
PYRepository: jaylfc/taOS Length of output: 530 Terminate the Compose process after a timeout. When 🤖 Prompt for AI Agents |
||
| if proc.returncode == 0: | ||
| return {"status": "ok", "detail": f"Docker Compose {stdout.decode().strip()}"} | ||
| detail = stderr.decode().strip()[:200] | ||
| return {"status": "error", "detail": detail or "Docker Compose v2 is unavailable"} | ||
| except FileNotFoundError: | ||
| return {"status": "unavailable", "detail": "Docker Compose v2 not installed"} | ||
| except Exception as e: | ||
| return {"status": "error", "detail": str(e)} | ||
|
|
||
|
|
||
| @router.get("/api/health-check") | ||
| async def api_health_check(request: Request): | ||
| """Run all health checks and return results.""" | ||
|
|
@@ -307,7 +325,10 @@ async def api_health_check(request: Request): | |
| # 3. Docker | ||
| checks.append(await _timed_check("Docker", _check_docker())) | ||
|
|
||
| # 4. Docker Compose v2 | ||
| checks.append(await _timed_check("Docker Compose v2", _check_docker_compose())) | ||
|
|
||
| # 5. Each backend | ||
| for backend in config.backends: | ||
| name = f"Backend: {backend.get('name', backend.get('url', 'unknown'))}" | ||
|
|
||
|
|
@@ -317,7 +338,7 @@ async def _check_backend(b=backend): | |
|
|
||
| checks.append(await _timed_check(name, _check_backend())) | ||
|
|
||
| # 6. QMD | ||
| async def _check_qmd(): | ||
| qmd = request.app.state.qmd_client | ||
| result = await qmd.health() | ||
|
|
@@ -333,7 +354,7 @@ async def _check_qmd(): | |
| # already covered by the "QMD Server" check above. See | ||
| # docs/design/framework-agnostic-runtime.md. | ||
|
|
||
| # 7. Disk space | ||
| disk = shutil.disk_usage("/") | ||
| disk_pct = (disk.used / disk.total) * 100 | ||
| disk_status = "ok" if disk_pct < 85 else ("warning" if disk_pct < 95 else "error") | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WARNING: Missing warning when Docker official repo fallback fails after missing-package rc==2
When
_apt_install_composereturns 2 (package not in distro) and_apt_install_docker_official_repoalso fails, the code falls through silently to the final "unavailable" block without warning that the official repo fallback was attempted and failed.Reply with
@kilocode-bot fix itto have Kilo Code address this issue.