Skip to content

Bump infra-e2e to testcontainers-go v0.42.0 and remove deprecated compose version field#13817

Merged
wu-sheng merged 11 commits intomasterfrom
infra-e2e/testcontainers-v042
Apr 15, 2026
Merged

Bump infra-e2e to testcontainers-go v0.42.0 and remove deprecated compose version field#13817
wu-sheng merged 11 commits intomasterfrom
infra-e2e/testcontainers-v042

Conversation

@wu-sheng
Copy link
Copy Markdown
Member

@wu-sheng wu-sheng commented Apr 14, 2026

Adopt infra-e2e testcontainers-go v0.42.0 migration

Changes:

What the infra-e2e change does:

  • Migrates testcontainers-go v0.11.1 → v0.42.0, using native compose.NewDockerComposeWith API
  • Deletes ~686 lines of custom DockerContainer/DockerProvider reimplementation
  • Removes docker-compose v1 binary installation from CI action.yaml
  • Adds TCP port waiting after docker compose up -d (matching old behavior)
  • Restores DOCKER_API_VERSION negotiation for Docker 29+ compatibility
  • User-facing contract (e2e.yaml format, env vars, log paths, CLI) is preserved

Compatibility:

  • extends in compose files: supported since Compose v2.20.0 ✓
  • depends_on with condition: service_healthy: supported natively in Compose v2 ✓
  • GitHub Actions ubuntu-latest and ubuntu-24.04 both ship Docker with Compose v2 plugin ✓

…pose version field

Pin infra-e2e to apache/skywalking-infra-e2e#146 (81adeec) which migrates
to testcontainers-go v0.42.0, using Docker Compose v2 plugin natively and
removing docker-compose v1 dependency.

Remove the deprecated `version` field from all docker-compose files for
Compose v2 compatibility.
- Update SHA to include the fix that removes compose.Wait(true),
  which was causing failures for run-once/init containers that
  exit after completing (e.g., mongodb-repl-setup, load generators).
- Remove version field from 2 missed .yaml compose files (the
  previous commit only handled .yml files).
@wu-sheng wu-sheng force-pushed the infra-e2e/testcontainers-v042 branch from 85df55c to 66641c3 Compare April 14, 2026 03:30
Includes:
- fix: add manual port waiting after compose up
- chore: remove containerd image store disable workaround
@wu-sheng wu-sheng added backend OAP backend related. test Test requirements about performance, feature or before release. labels Apr 14, 2026
@wu-sheng wu-sheng added this to the 10.5.0 milestone Apr 14, 2026
@wu-sheng wu-sheng marked this pull request as ready for review April 15, 2026 03:47
@wu-sheng wu-sheng merged commit 9e55f57 into master Apr 15, 2026
415 of 419 checks passed
@wu-sheng wu-sheng deleted the infra-e2e/testcontainers-v042 branch April 15, 2026 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend OAP backend related. test Test requirements about performance, feature or before release.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants