From a5e19eff60161df31c9632b73c3496a495d866dc Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 23 Jun 2026 21:01:57 +0800 Subject: [PATCH] chore: qmd version bump, macOS container runtime deps, ignore inventory pycache - roles/vhosts/common: add docker/docker-compose/colima to macOS brew deps (headless container runtime for qmd PG memory-bridge tests) - roles/vhosts/qmd: bump qmd_version - .gitignore: ignore inventory/__pycache__/ Co-Authored-By: Claude Opus 4.8 --- .gitignore | 1 + roles/vhosts/common/defaults/main.yml | 10 ++++++++++ roles/vhosts/qmd/defaults/main.yml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b2d3710..536654b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ xfce-secrets.yml +inventory/__pycache__/ .playwright-mcp/ .env .artifacts/ diff --git a/roles/vhosts/common/defaults/main.yml b/roles/vhosts/common/defaults/main.yml index 3531384..2f50583 100644 --- a/roles/vhosts/common/defaults/main.yml +++ b/roles/vhosts/common/defaults/main.yml @@ -22,8 +22,18 @@ enable_common: true # macOS (Darwin) baseline: shared Homebrew CLI prerequisites used by helper # scripts across roles (e.g. jq is required by vault's init_vault_admin.sh). # macOS ships curl/base64 already; jq is not present by default. +# +# docker/docker-compose/colima provide a headless container runtime on macOS +# (colima runs the Docker daemon in a lightweight VM; the docker formula is the +# CLI only, no Docker Desktop). Needed for container workloads such as the qmd +# PostgreSQL memory-bridge integration tests (test/pg-compose.yml). Each formula +# installs a /opt/homebrew/bin/ binary, so the task's `creates` check stays +# idempotent. After install, start the runtime once with `colima start`. common_darwin_brew_packages: - jq + - docker + - docker-compose + - colima common_firewall: enabled: true diff --git a/roles/vhosts/qmd/defaults/main.yml b/roles/vhosts/qmd/defaults/main.yml index fd99d0b..9baedbb 100644 --- a/roles/vhosts/qmd/defaults/main.yml +++ b/roles/vhosts/qmd/defaults/main.yml @@ -3,7 +3,7 @@ qmd_user: "{{ ansible_env.USER | default('ubuntu') }}" qmd_group: "{{ 'staff' if ansible_os_family == 'Darwin' else (ansible_env.USER | default('ubuntu')) }}" qmd_home: "{{ ansible_env.HOME | default('/home/' + qmd_user) }}" qmd_source_repo: "https://github.com/ai-workspace-services/qmd.git" -qmd_version: "6021ea34ac27ac9b5c9a7d655500544917c801dd" +qmd_version: "236c83a5f38d860fbf56829ba4e188c1fa2ae52b" qmd_source_dir: "{{ qmd_home }}/.local/src/qmd" qmd_runtime_archive: "{{ lookup('ansible.builtin.env', 'QMD_RUNTIME_ARCHIVE') | default('', true) }}" qmd_runtime_marker: "{{ qmd_source_dir }}/.runtime-archive-sha256"