Skip to content
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.

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

vendor: update buildx to latest docker/cli #2460

Merged
merged 1 commit into from
May 21, 2024

Conversation

jsternberg
Copy link
Collaborator

This version of docker/cli has changes to remove compose-cli wrapper and move all CLI metrics to OTEL.

@@ -269,8 +269,7 @@ func (o *buildOptionsHash) String() string {
}

func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions) (err error) {
mp := dockerCli.MeterProvider(ctx)
defer metricutil.Shutdown(ctx, mp)
mp := dockerCli.MeterProvider()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This returns a meter provider initialized by the CLI now and the CLI handles reporting and shutdown now.

Need to double check that this works correctly with standalone.

go.mod Outdated Show resolved Hide resolved
This version of docker/cli has changes to remove compose-cli wrapper and
move all CLI metrics to OTEL.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
@jsternberg
Copy link
Collaborator Author

cc @laurazard

@thompson-shaun thompson-shaun added this to the v0.14.1 milestone May 16, 2024
Copy link
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

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

LGTM

@tonistiigi tonistiigi merged commit cc9ea87 into docker:master May 21, 2024
102 checks passed
@jsternberg jsternberg deleted the vendor-update branch May 28, 2024 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants