[codex] Support standalone podman-compose discovery

.github/workflows/rust-port-convergence.yml

@@ -92,6 +92,14 @@ jobs:
   real-engine-lifecycle-smoke:
     name: Real Engine Lifecycle Smoke
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: docker
+            smoke_target: real-engine-lifecycle-smoke-docker
+          - runner: podman
+            smoke_target: real-engine-lifecycle-smoke-podman
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -101,14 +109,24 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Build release binary
-        run: cargo build --release --manifest-path cmd/devcontainer/Cargo.toml
-
-      - name: Docker version
-        run: docker version
+      - name: Install Podman Compose
+        if: matrix.runner == 'podman'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y podman podman-compose
+
+      - name: Runtime version
+        run: |
+          if [[ "${{ matrix.runner }}" == "podman" ]]; then
+            podman version
+            podman-compose version
+          else
+            docker version
+            docker compose version
+          fi
 
       - name: Real engine lifecycle smoke
-        run: ./scripts/standalone/real-engine-smoke.sh ./cmd/devcontainer/target/release/devcontainer
+        run: make ${{ matrix.smoke_target }}
 
   upstream-convergence:
     name: Upstream Convergence Baseline

Makefile

@@ -4,6 +4,9 @@
 	rust-check \
 	rust-tests \
 	build-release \
+	real-engine-lifecycle-smoke \
+	real-engine-lifecycle-smoke-docker \
+	real-engine-lifecycle-smoke-podman \
 	standalone-artifact-smoke \
 	pypi-wheel-smoke \
 	native-only-startup-contract \
@@ -44,6 +47,14 @@ rust-tests:
 build-release:
 	cargo build --release --manifest-path $(RUST_MANIFEST)
 
+real-engine-lifecycle-smoke: real-engine-lifecycle-smoke-docker real-engine-lifecycle-smoke-podman
+
+real-engine-lifecycle-smoke-docker: build-release
+	./scripts/standalone/real-engine-smoke.sh $(RELEASE_BINARY)
+
+real-engine-lifecycle-smoke-podman: build-release
+	./scripts/standalone/real-engine-smoke.sh $(RELEASE_BINARY) --docker-path podman --docker-compose-path podman-compose
+
 standalone-artifact-smoke: build-release
 	./scripts/standalone/smoke.sh $(RELEASE_BINARY)
 

cmd/devcontainer/src/runtime/compose/args.rs

@@ -2,27 +2,9 @@
 
 use std::path::PathBuf;
 
-use crate::commands::common;
-
 use super::ComposeSpec;
 
-pub(super) fn compose_args(spec: &ComposeSpec, subcommand: &str, tail: &[&str]) -> Vec<String> {
-    compose_args_with_override(spec, subcommand, tail, None)
-}
-
-pub(super) fn compose_args_with_override(
-    spec: &ComposeSpec,
-    subcommand: &str,
-    tail: &[&str],
-    override_file: Option<&PathBuf>,
-) -> Vec<String> {
-    compose_args_owned(
-        spec,
-        subcommand,
-        override_file,
-        tail.iter().map(|value| value.to_string()).collect(),
-    )
-}
+use crate::commands::common;
 
 pub(super) fn compose_args_owned(
     spec: &ComposeSpec,

cmd/devcontainer/src/runtime/compose/mod.rs

@@ -15,6 +15,9 @@ use crate::commands::configuration;
 use super::context::ResolvedConfig;
 use super::engine;
 
+const COMPOSE_PROJECT_LABEL: &str = "com.docker.compose.project";
+const COMPOSE_SERVICE_LABEL: &str = "com.docker.compose.service";
+
 pub(crate) struct ComposeSpec {
     pub(crate) files: Vec<PathBuf>,
     pub(crate) service: String,
@@ -182,19 +185,6 @@ pub(crate) fn up_service(
     Ok(())
 }
 
-pub(crate) fn remove_service(resolved: &ResolvedConfig, args: &[String]) -> Result<(), String> {
-    let spec = load_compose_spec(resolved)?
-        .ok_or_else(|| "Compose configuration was expected but not found".to_string())?;
-    let result = engine::run_compose(
-        args,
-        args::compose_args(&spec, "rm", &["-s", "-f", &spec.service]),
-    )?;
-    if result.status_code != 0 {
-        return Err(engine::stderr_or_stdout(&result));
-    }
-    Ok(())
-}
-
 pub(crate) fn resolve_container_id(
     resolved: &ResolvedConfig,
     args: &[String],
@@ -216,12 +206,19 @@ fn resolve_container_id_with_options(
 ) -> Result<Option<String>, String> {
     let spec = load_compose_spec(resolved)?
         .ok_or_else(|| "Compose configuration was expected but not found".to_string())?;
-    let mut ps_args = vec!["-q"];
+    let mut ps_args = vec!["ps".to_string(), "-q".to_string()];
     if include_stopped {
-        ps_args.push("-a");
+        ps_args.push("-a".to_string());
     }
-    ps_args.push(&spec.service);
-    let result = engine::run_compose(args, args::compose_args(&spec, "ps", &ps_args))?;
+    ps_args.push("--filter".to_string());
+    ps_args.push(format!(
+        "label={COMPOSE_PROJECT_LABEL}={}",
+        spec.project_name
+    ));
+    ps_args.push("--filter".to_string());
+    ps_args.push(format!("label={COMPOSE_SERVICE_LABEL}={}", spec.service));
+
+    let result = engine::run_engine(args, ps_args)?;
     if result.status_code != 0 {
         return Err(engine::stderr_or_stdout(&result));
     }

cmd/devcontainer/src/runtime/container/discovery.rs

@@ -90,7 +90,7 @@ fn ensure_compose_up_container(
     let remove_existing = common::has_flag(args, "--remove-existing-container");
     if let Some(container_id) = compose::resolve_container_id(resolved, args)? {
         if remove_existing {
-            compose::remove_service(resolved, args)?;
+            remove_container(args, &container_id)?;
             return create_compose_container(resolved, args, image_name, remote_workspace_folder);
         }
         return refresh_compose_container(
@@ -105,7 +105,7 @@ fn ensure_compose_up_container(
 
     if let Some(container_id) = compose::resolve_container_id_including_stopped(resolved, args)? {
         if remove_existing {
-            compose::remove_service(resolved, args)?;
+            remove_container(args, &container_id)?;
             return create_compose_container(resolved, args, image_name, remote_workspace_folder);
         }
         return refresh_compose_container(