docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 00:47:48 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1415 from jedevc/cherry-pick-1383-to-0.9

Browse Source 
[0.9] driver: don't create tracer delegate opt if tracer is nil
This commit is contained in:
CrazyMax 2022-11-21 10:29:09 +01:00 committed by GitHub
commit 2af40b75b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
driver/docker-container/driver.go
View File

@ -357,11 +357,14 @@ func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
return nil, err return nil, err
} }
td, _ := exp.(client.TracerDelegate) var opts []client.ClientOpt
opts = append(opts, client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
return client.New(ctx, "", client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
return conn, nil return conn, nil
}), client.WithTracerDelegate(td)) }))
if td, ok := exp.(client.TracerDelegate); ok {
opts = append(opts, client.WithTracerDelegate(td))
}
return client.New(ctx, "", opts...)
} }
func (d *Driver) Factory() driver.Factory { func (d *Driver) Factory() driver.Factory {

11
driver/kubernetes/driver.go
View File

@ -215,11 +215,14 @@ func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
return nil, err return nil, err
} }
td, _ := exp.(client.TracerDelegate) var opts []client.ClientOpt
opts = append(opts, client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
return client.New(ctx, "", client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
return conn, nil return conn, nil
}), client.WithTracerDelegate(td)) }))
if td, ok := exp.(client.TracerDelegate); ok {
opts = append(opts, client.WithTracerDelegate(td))
}
return client.New(ctx, "", opts...)
} }
func (d *Driver) Factory() driver.Factory { func (d *Driver) Factory() driver.Factory {