Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore(local): support USE_PODMAN flag for docker (#4505)
Will Hutchinson967dbb87153c
diff --git a/rust/cloud-storage/Cargo.lock b/rust/cloud-storage/Cargo.lockindex 4eaef0f877..d10a2347c0 100644--- a/rust/cloud-storage/Cargo.lock+++ b/rust/cloud-storage/Cargo.lock@@ -15072,6 +15072,7 @@ dependencies = ["indoc","libc","macro_aws_config",+ "macro_env_var","macro_queues","serde","serde_json",diff --git a/rust/cloud-storage/tools/xtask/Cargo.toml b/rust/cloud-storage/tools/xtask/Cargo.tomlindex 770a907718..11c45651b0 100644--- a/rust/cloud-storage/tools/xtask/Cargo.toml+++ b/rust/cloud-storage/tools/xtask/Cargo.toml@@ -1,9 +1,9 @@[package]-name = "xtask"-version = "0.1.0"+description = "Repo automation: regenerates workspace-hack and the deploy dep-closure map"edition = "2021"+name = "xtask"publish = false-description = "Repo automation: regenerates workspace-hack and the deploy dep-closure map"+version = "0.1.0"[dependencies]anyhow = { workspace = true }@@ -12,8 +12,8 @@ serde_json = { workspace = true }# Cargo.lock, so dev machines and CI always run the identical generator —# upgrading it is an explicit, reviewed lock change. guppy is pinned to the# version this hakari release is built against.-hakari = { version = "0.17.9", features = ["cli-support"] }guppy = "0.17.24"+hakari = { version = "0.17.9", features = ["cli-support"] }# Define GitHub Actions workflows in Rust (`cargo run -p xtask -- workflows`).# xtask is excluded from hakari traversal, so these stay out of workspace-hack.gh-workflow = "0.8"@@ -22,22 +22,22 @@ indoc = "2"# hakari traversal, so these deps never enter workspace-hack. We reuse the# workspace-pinned versions so the orchestrator builds against the same crate# graph as the services it launches.-clap = { workspace = true }-serde = { workspace = true }-tokio = { workspace = true }-aws-sdk-sqs = { workspace = true }aws-sdk-dynamodb = { workspace = true }aws-sdk-s3 = { workspace = true }+aws-sdk-sqs = { workspace = true }+clap = { workspace = true }macro_aws_config = { path = "../../macro_aws_config" }macro_queues = { path = "../../macro_queues" }+serde = { workspace = true }+tokio = { workspace = true }# Typed docker-compose model (build the override as structs, not strings) +# Docker Engine API client for the discrete container/image ops.-docker-compose-types = { version = "0.24", features = ["indexmap"] }bollard = "0.21"+console = "0.15"+docker-compose-types = { version = "0.24", features = ["indexmap"] }indexmap = { workspace = true }-serde_yaml = "0.9"indicatif = "0.18"-console = "0.15"+serde_yaml = "0.9"# Parse user-provided `--env-file` overlays (reading only; no crate emits the# docker-compose `env_file` format we generate). EnumIter derives the port list.dotenvy = { workspace = true }@@ -45,3 +45,4 @@ strum = { workspace = true, features = ["derive"] }# Signal the frontend dev server's whole process group on shutdown (kill bun +# the Vite child it spawns, not just bun).libc = "0.2"+macro_env_var = { path = "../../macro_env_var" }diff --git a/rust/cloud-storage/tools/xtask/src/local/docker.rs b/rust/cloud-storage/tools/xtask/src/local/docker.rsindex 7204e02999..f0e2675c40 100644--- a/rust/cloud-storage/tools/xtask/src/local/docker.rs+++ b/rust/cloud-storage/tools/xtask/src/local/docker.rs@@ -7,6 +7,7 @@use anyhow::{Context, Result};use bollard::models::{NetworkCreateRequest, VolumeCreateRequest};use bollard::Docker;+use macro_env_var::maybe_env_var;/// Run a future to completion on a throwaway current-thread runtime (xtask's/// flow is synchronous).@@ -18,8 +19,17 @@ fn block_on<T>(fut: impl std::future::Future<Output = Result<T>>) -> Result<T> {.block_on(fut)}+maybe_env_var! {+ struct UsePodman;+}fn connect() -> Result<Docker> {- Docker::connect_with_local_defaults().context("connecting to the Docker daemon")+ match UsePodman::new()+ .map(|p| p.parse::<bool>().unwrap())+ .unwrap_or(false)+ {+ true => Docker::connect_with_podman_defaults().context("connecting to the Docker daemon"),+ false => Docker::connect_with_local_defaults().context("connecting to the Docker daemon"),+ }}/// Whether an image with `tag` exists locally.