From ad6c6f37a17f172b29d35e6c63b555d831a150f6 Mon Sep 17 00:00:00 2001 From: ZeroPointSix Date: Sun, 7 Jun 2026 22:05:21 +0800 Subject: [PATCH 1/5] fix watchtower docker api version --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ed1b655..428749b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,6 +83,8 @@ services: environment: # 与上方 app 服务的 WATCHTOWER_HTTP_API_TOKEN 保持一致；留空均使用同一内置默认值 - WATCHTOWER_HTTP_API_TOKEN=${WATCHTOWER_HTTP_API_TOKEN:-outlook-mail-plus-watchtower-default} + # Docker Engine 29+ 要求 Docker API >= 1.44；Watchtower 默认 API 版本较低，需显式覆盖 + - DOCKER_API_VERSION=${WATCHTOWER_DOCKER_API_VERSION:-1.44} - WATCHTOWER_HTTP_API_UPDATE=true - WATCHTOWER_CLEANUP=true # 禁用定时轮询，仅通过界面触发更新 From 01a8a4acde70a11ec709f6984f52f1a7e74275a3 Mon Sep 17 00:00:00 2001 From: ZeroPointSix Date: Sun, 7 Jun 2026 22:05:34 +0800 Subject: [PATCH 2/5] document watchtower docker api version --- .env.example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.env.example b/.env.example index bd299f0..b546380 100644 --- a/.env.example +++ b/.env.example @@ -42,6 +42,10 @@ GPTMAIL_API_KEY=gpt-test # 注意：若填写此处，docker-compose.yml 中 watchtower 服务会自动同步读取同一变量 WATCHTOWER_HTTP_API_TOKEN= +# Watchtower 连接宿主机 Docker daemon 时使用的 Docker API 版本 +# Docker Engine 29+ 最低要求 1.44；通常无需修改，除非你的 Docker daemon 明确要求其他版本 +# WATCHTOWER_DOCKER_API_VERSION=1.44 + # Docker API 自更新（可选，高级功能） # ⚠️ 警告：启用后容器可通过 Docker API 控制宿主机其他容器，存在安全风险 # 需同时取消 docker-compose.yml 中 docker.sock 挂载的注释 From 3595623204d90d4b176b26dbfa1080c6422186c3 Mon Sep 17 00:00:00 2001 From: ZeroPointSix Date: Sun, 7 Jun 2026 22:05:43 +0800 Subject: [PATCH 3/5] add watchtower docker api config regression test --- tests/test_watchtower_docker_api_config.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 tests/test_watchtower_docker_api_config.py diff --git a/tests/test_watchtower_docker_api_config.py b/tests/test_watchtower_docker_api_config.py new file mode 100644 index 0000000..cd0dd1c --- /dev/null +++ b/tests/test_watchtower_docker_api_config.py @@ -0,0 +1,20 @@ +"""Watchtower Docker API compatibility config regression tests.""" + +from pathlib import Path + + +REPO_ROOT = Path(__file__).resolve().parents[1] + + +def test_watchtower_sets_docker_api_version_for_docker_29(): + """Watchtower must not use its lower default API version against Docker 29+.""" + compose = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8") + + assert "DOCKER_API_VERSION=${WATCHTOWER_DOCKER_API_VERSION:-1.44}" in compose + + +def test_env_example_documents_watchtower_docker_api_version(): + """The optional override is documented for operators who need to tune it.""" + env_example = (REPO_ROOT / ".env.example").read_text(encoding="utf-8") + + assert "WATCHTOWER_DOCKER_API_VERSION=1.44" in env_example From bed449da81e99612f679b2318268eb6bb47c8a57 Mon Sep 17 00:00:00 2001 From: ZeroPointSix Date: Sun, 7 Jun 2026 22:05:59 +0800 Subject: [PATCH 4/5] use unittest for watchtower docker api config test --- tests/test_watchtower_docker_api_config.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/test_watchtower_docker_api_config.py b/tests/test_watchtower_docker_api_config.py index cd0dd1c..a48ec34 100644 --- a/tests/test_watchtower_docker_api_config.py +++ b/tests/test_watchtower_docker_api_config.py @@ -1,20 +1,25 @@ """Watchtower Docker API compatibility config regression tests.""" from pathlib import Path +import unittest REPO_ROOT = Path(__file__).resolve().parents[1] -def test_watchtower_sets_docker_api_version_for_docker_29(): - """Watchtower must not use its lower default API version against Docker 29+.""" - compose = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8") +class WatchtowerDockerApiConfigTests(unittest.TestCase): + def test_watchtower_sets_docker_api_version_for_docker_29(self): + """Watchtower must not use its lower default API version against Docker 29+.""" + compose = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8") - assert "DOCKER_API_VERSION=${WATCHTOWER_DOCKER_API_VERSION:-1.44}" in compose + self.assertIn("DOCKER_API_VERSION=${WATCHTOWER_DOCKER_API_VERSION:-1.44}", compose) + def test_env_example_documents_watchtower_docker_api_version(self): + """The optional override is documented for operators who need to tune it.""" + env_example = (REPO_ROOT / ".env.example").read_text(encoding="utf-8") -def test_env_example_documents_watchtower_docker_api_version(): - """The optional override is documented for operators who need to tune it.""" - env_example = (REPO_ROOT / ".env.example").read_text(encoding="utf-8") + self.assertIn("WATCHTOWER_DOCKER_API_VERSION=1.44", env_example) - assert "WATCHTOWER_DOCKER_API_VERSION=1.44" in env_example + +if __name__ == "__main__": + unittest.main() From 22d13edd86385b0e4f3bae18255e4254b5267d06 Mon Sep 17 00:00:00 2001 From: ZeroPointSix Date: Thu, 11 Jun 2026 05:55:52 +0800 Subject: [PATCH 5/5] docs: record PR 81 validation --- WORKSPACE.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/WORKSPACE.md b/WORKSPACE.md index 3aec1c2..72c35ef 100644 --- a/WORKSPACE.md +++ b/WORKSPACE.md @@ -4,6 +4,48 @@ --- +## 2026-06-10 + +### 操作记录 + +#### 277. PR #81 Watchtower Docker API 版本兼容巡检 + +**时间**：2026-06-10 14:05 PDT + +**操作对象**：PR #81 — `[codex] Fix Watchtower Docker API version for Docker 29` + +**认领记录**：CodeXWeb 自动巡检认领评论 https://github.com/ZeroPointSix/outlookEmailPlus/pull/81#issuecomment-4674759805 + +**操作背景**： +本轮自动巡检只处理 1 个对象。PR #81 已有维护者评论要求补充确认 Watchtower/Docker API 兼容性与测试结果，因此本轮仅围绕该 PR 的 `DOCKER_API_VERSION` 配置和验证边界做复核，不切换到其他 Issue/PR。 + +**复核依据**： + +1. Docker CLI 官方文档说明 `DOCKER_API_VERSION` 可覆盖协商得到的 API 版本。 +2. Docker Engine API 官方版本矩阵显示 Docker Engine 29.0/29.1/29.2 的最低 API 版本为 1.44。 +3. PR #81 当前实现将 Watchtower 环境变量设置为 `DOCKER_API_VERSION=${WATCHTOWER_DOCKER_API_VERSION:-1.44}`，并在 `.env.example` 中提供可覆盖项，符合上述兼容性方向。 + +**验证结果**： + +1. `.venv/bin/python -m unittest tests.test_watchtower_docker_api_config -v` → 2 tests passed。 +2. `.venv/bin/python -m unittest tests.test_version_update -v` → 51 tests passed。 +3. `.venv/bin/python -m pytest -q`（启动本地 Flask 测试服务后执行）→ 1524 passed, 7 skipped, 31 subtests passed, 5 failed, 用时 669.49s。 +4. 全量 pytest 失败项： + - `tests/test_csrf_browser_recovery.py::CsrfBrowserRecoveryTests::test_browser_recovers_after_stale_csrf_token_and_retries_once`：等待“导入完成” toast 超时，日志显示 stale CSRF 后第二次 `/api/accounts` 仍返回 400。 + - `tests/test_pool_cf_real_e2e.py::RealCFWorkerE2ETests::test_01_claim_random_creates_real_cf_mailbox`。 + - `tests/test_pool_cf_real_e2e.py::RealCFWorkerE2ETests::test_02_claim_then_read_messages_empty`。 + - `tests/test_pool_cf_real_e2e.py::RealCFWorkerE2ETests::test_03_claim_complete_deletes_remote_mailbox`。 + - `tests/test_pool_cf_real_e2e.py::RealCFWorkerE2ETests::test_04_claim_complete_timeout_skips_delete`。 +5. Docker/Watchtower 容器级 smoke 未能执行：沙箱远程环境没有 `docker`/`docker compose` CLI，无法真实拉起 Watchtower 容器验证实际镜像行为。 + +**结论**： +- 本轮未修改 PR 的业务代码或 Docker 配置；只补充 Workspace 巡检记录。 +- PR #81 的 Watchtower Docker API 配置与 Docker 官方文档方向一致，聚焦回归测试通过。 +- 完整 pytest 存在 5 个失败；从失败文件和错误看，未直接指向 Watchtower Docker API 配置变更，但仍需在 PR 中如实保留为验证风险。 +- 不自动合并 PR。 + +**是否改动代码**：否（仅补充本 Workspace 记录） + ## 2026-05-19 ### 操作记录