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

Merge pull request #2000 from jedevc/fix-race-container-creation

Browse Source 
docker-container: avoid fail if container conflict
This commit is contained in:
CrazyMax 2023-08-21 16:11:02 +02:00 committed by GitHub
commit a97e1641a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import (
"github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
"github.com/docker/docker/errdefs"
dockerarchive "github.com/docker/docker/pkg/archive" dockerarchive "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
@ -148,14 +149,16 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
} }
_, err := d.DockerAPI.ContainerCreate(ctx, cfg, hc, &network.NetworkingConfig{}, nil, d.Name) _, err := d.DockerAPI.ContainerCreate(ctx, cfg, hc, &network.NetworkingConfig{}, nil, d.Name)
if err != nil { if err != nil && !errdefs.IsConflict(err) {
return err return err
} }
if err := d.copyToContainer(ctx, d.InitConfig.Files); err != nil { if err == nil {
return err if err := d.copyToContainer(ctx, d.InitConfig.Files); err != nil {
} return err
if err := d.start(ctx, l); err != nil { }
return err if err := d.start(ctx, l); err != nil {
return err
}
} }
if err := d.wait(ctx, l); err != nil { if err := d.wait(ctx, l); err != nil {
return err return err