(skywalking-infra-e2e) branch fix/compose-collector-v2 created (now 8f1fbce)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wu-sheng pushed a change to branch fix/compose-collector-v2
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git


      at 8f1fbce  Use Docker Compose v2 (`docker compose`) in the compose log collector

This branch includes the following new commits:

     new 8f1fbce  Use Docker Compose v2 (`docker compose`) in the compose log collector

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(skywalking-infra-e2e) 01/01: Use Docker Compose v2 (`docker compose`) in the compose log collector

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wu-sheng pushed a commit to branch fix/compose-collector-v2
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git

commit 8f1fbce7680c5cd17dae0de16dc070d2b0147a2c
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Jun 17 22:13:21 2026 +0800

    Use Docker Compose v2 (`docker compose`) in the compose log collector
    
    The compose collector shells out to `docker-compose -f ... -p ... ps -q ...` (Compose
    v1) to locate containers for log collection. GitHub-hosted `ubuntu-24.04` runners no
    longer ship the standalone `docker-compose` (v1) binary, so collection fails with
    `docker-compose: command not found` on every failed e2e (setup already uses Compose v2
    via testcontainers-go, so only the collector was still on v1).
    
    Switch `ComposeCommand` from `docker-compose` to `docker compose`. The command is run
    via `bash -ec`, so the two-word v2 plugin invocation works as-is, and v2 accepts the
    same `-f / -p / ps -q` flags.
    
    Validated locally with a compose e2e (nginx): with `docker-compose` v1 absent (and with
    a failing `docker-compose` stub shadowing PATH), `e2e run` completes green and the
    collector gathers container files via `docker compose` v2 without ever invoking
    `docker-compose`.
---
 internal/constant/compose.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/constant/compose.go b/internal/constant/compose.go
index 30992c4..3b47be9 100644
--- a/internal/constant/compose.go
+++ b/internal/constant/compose.go
@@ -20,5 +20,5 @@ package constant
 
 const (
 	Compose        = "compose"
-	ComposeCommand = "docker-compose"
+	ComposeCommand = "docker compose"
 )