mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: when checking for folder existence in container, only pull the

Browse Source 
image if not present

works around issue reported in
https://github.com/rancher/k3d/discussions/703 if image is present
locally
This commit is contained in:
iwilltry42 2021-08-18 14:08:37 +02:00
parent e0f5e2ba2c
commit 9abcbedb37
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/runtimes/docker/container.go
View File

@ -191,22 +191,31 @@ func executeCheckInContainer(ctx context.Context, image string, cmd []string) (i
}
defer docker.Close()
if err = pullImage(ctx, docker, image); err != nil {
return -1, err
}
resp, err := docker.ContainerCreate(ctx, &container.Config{
Image: image,
Cmd: cmd,
Tty: false,
Entrypoint: []string{},
}, nil, nil, nil, "")
if err != nil {
log.Errorf("Failed to create container from image %s with cmd %s", image, cmd)
return -1, err
// create container
var resp container.ContainerCreateCreatedBody
for {
resp, err = docker.ContainerCreate(ctx, &container.Config{
Image: image,
Cmd: cmd,
Tty: false,
Entrypoint: []string{},
}, nil, nil, nil, "")
if err != nil {
if client.IsErrNotFound(err) {
if err := pullImage(ctx, docker, image); err != nil {
log.Errorf("Failed to create container from image %s with cmd %s", image, cmd)
return -1, err
}
continue
}
log.Errorf("Failed to create container from image %s with cmd %s", image, cmd)
return -1, err
}
break
}
if err = startContainer(ctx, resp.ID); err != nil {
log.Errorf("Failed to start container from image %s with cmd %s", image, cmd)
return -1, err
}