Skip to content

[master] Bump compose v2.33.0 #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Feb 14, 2025
Merged

[master] Bump compose v2.33.0 #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DOCKER_CLI_REF ?= $(REF)
DOCKER_ENGINE_REF ?= $(REF)
# DOCKER_COMPOSE_REF is the version of compose to package. It usually is a tag,
# but can be a valid git reference in DOCKER_COMPOSE_REPO.
DOCKER_COMPOSE_REF ?= v2.32.4
DOCKER_COMPOSE_REF ?= v2.33.0
# DOCKER_BUILDX_REF is the version of compose to package. It usually is a tag,
# but can be a valid git reference in DOCKER_BUILDX_REPO.
DOCKER_BUILDX_REF ?= v0.20.1
Expand Down
1 change: 1 addition & 0 deletions deb/common/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Homepage: https://github.com/docker/buildx
Package: docker-compose-plugin
Priority: optional
Architecture: linux-any
Recommends: docker-buildx-plugin
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Silly question; if compose shells out to buildx, and running as “standalone” (docker-compose) does it shell out to /whatever/path/for /plugins/docker-buildx (standalone) or docker buildx ? Mostly looking at Recommends: in the docker-compose-plugin package, and if that (when installed separate from the CLI) would also be able to use it, or if it should depend on docker-ce-cli already having the Recommends: for buildx

Copy link
Copy Markdown
Contributor Author

@ndeloof ndeloof Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compose executes the CLI plugin directly (standalone) based on binary file path retrieved from manager.GetPlugin.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha; thanks! Wanted to double-check we wouldn't end up in a case where the plug-in was there, but compose still trying to execute it in a different location.

We should probably look if we can have good ways for the CLI (when compose is executed as plugin) to pass information to the plugin(s), so that we have a single source of truth for resolving plugins, but that's an existing problem.

Enhances: docker-ce-cli
Description: Docker Compose (V2) plugin for the Docker CLI.
.
Expand Down
1 change: 1 addition & 0 deletions rpm/SPECS/docker-compose-plugin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Vendor: Docker
Packager: Docker <support@docker.com>

Enhances: docker-ce-cli
Recommends: docker-buildx-plugin

BuildRequires: bash

Expand Down
Loading