Skip to content

fix(dind): use docker image load #3073

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
merged 2 commits into from
Mar 31, 2025
Merged

fix(dind): use docker image load #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03a6626
fix(dind): use docker image load
acouvreur Mar 30, 2025
d1b1fd4
fix pull image
acouvreur Mar 31, 2025
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
4 changes: 2 additions & 2 deletions modules/dind/dind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (c *Container) LoadImage(ctx context.Context, image string) (err error) {
err = errors.Join(err, os.Remove(imagesTar.Name()))
}()

if err = provider.SaveImages(context.Background(), imagesTar.Name(), image); err != nil {
if err = provider.SaveImages(ctx, imagesTar.Name(), image); err != nil {
return fmt.Errorf("save images: %w", err)
}

Expand All @@ -100,7 +100,7 @@ func (c *Container) LoadImage(ctx context.Context, image string) (err error) {
return fmt.Errorf("copy image to container: %w", err)
}

if _, _, err = c.Container.Exec(ctx, []string{"docker", "image", "import", containerPath, image}); err != nil {
if _, _, err = c.Container.Exec(ctx, []string{"docker", "image", "load", "-i", containerPath}); err != nil {
return fmt.Errorf("import image: %w", err)
}

Expand Down
18 changes: 11 additions & 7 deletions modules/dind/dind_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package dind_test

import (
"context"
"slices"
"testing"
"time"

Expand Down Expand Up @@ -33,7 +32,7 @@ func Test_LoadImages(t *testing.T) {
require.NoError(t, err)

// ensure nginx image is available locally
err = provider.PullImage(ctx, "nginx")
err = provider.PullImage(ctx, "nginx:1.27")
require.NoError(t, err)

t.Run("not-available", func(t *testing.T) {
Expand All @@ -42,16 +41,21 @@ func Test_LoadImages(t *testing.T) {
})

t.Run("success", func(t *testing.T) {
err := dindContainer.LoadImage(ctx, "nginx")
err := dindContainer.LoadImage(ctx, "nginx:1.27")
require.NoError(t, err)

images, err := cli.ImageList(ctx, image.ListOptions{})
require.NoError(t, err)

found := slices.ContainsFunc(images, func(img image.Summary) bool {
return len(img.RepoTags) > 0 && img.RepoTags[0] == "nginx:latest"
})
if len(images) == 0 || len(images) > 1 {
t.Fatalf("got %d images, expected 1", len(images))
}

require.True(t, found)
img, err := cli.ImageInspect(ctx, images[0].ID)
require.NoError(t, err)

require.Equal(t, "nginx:1.27", img.RepoTags[0])
require.Equal(t, []string{"/docker-entrypoint.sh"}, []string(img.Config.Entrypoint))
require.Equal(t, []string{"nginx", "-g", "daemon off;"}, []string(img.Config.Cmd))
})
}
Loading