Skip to content

Use Compose v2 for docker-compose compatibility#1108

Open
Haihan-Jiang wants to merge 1 commit into
GoogleCloudPlatform:masterfrom
Haihan-Jiang:codex/cloud-builders-compose-v2
Open

Use Compose v2 for docker-compose compatibility#1108
Haihan-Jiang wants to merge 1 commit into
GoogleCloudPlatform:masterfrom
Haihan-Jiang:codex/cloud-builders-compose-v2

Conversation

@Haihan-Jiang
Copy link
Copy Markdown

Summary

  • stop installing the legacy docker-compose v1 apt package in the Docker builder image
  • keep the docker-compose command name available through a small wrapper around docker compose
  • add build-time checks that docker-compose --version works and the wrapper reports the same Compose v2 version as docker compose version

Fixes #1042.

Validation

  • git diff --check
  • docker build --file=Dockerfile-base --tag=us-docker.pkg.dev/cloud-builders-dev/cloud-builders/docker-base .
  • docker build --file=Dockerfile-versioned --build-arg=DOCKER_VERSION=5:24.0.9-1~ubuntu.20.04~focal --tag=cloud-builders-docker-compose-v2-test .
  • docker run --rm --entrypoint /bin/sh cloud-builders-docker-compose-v2-test -c 'docker compose version && docker-compose --version && test "$(docker compose version --short)" = "$(docker-compose version --short)"'
  • confirmed the image contains docker-compose-plugin 2.35.1-1~ubuntu.20.04~focal
  • confirmed the image does not contain the legacy docker-compose package

@Haihan-Jiang Haihan-Jiang changed the title [codex] Use Compose v2 for docker-compose compatibility Use Compose v2 for docker-compose compatibility May 26, 2026
@Haihan-Jiang Haihan-Jiang marked this pull request as ready for review May 30, 2026 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker builder image ships mismatching versions of docker compose

1 participant