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

add dry-run support for pull command #10341

Merged
merged 1 commit into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 25 additions & 7 deletions pkg/api/dryrunclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import (
"strings"
"sync"

"github.com/docker/buildx/builder"
"github.com/docker/buildx/util/imagetools"
"github.com/docker/cli/cli/command"

"github.com/distribution/distribution/v3/uuid"
moby "github.com/docker/docker/api/types"
containerType "github.com/docker/docker/api/types/container"
Expand Down Expand Up @@ -52,6 +56,7 @@ type DryRunKey struct{}
type DryRunClient struct {
apiClient client.APIClient
execs sync.Map
resolver *imagetools.Resolver
}

type execDetails struct {
Expand All @@ -60,11 +65,20 @@ type execDetails struct {
}

// NewDryRunClient produces a DryRunClient
func NewDryRunClient(apiClient client.APIClient) *DryRunClient {
func NewDryRunClient(apiClient client.APIClient, cli *command.DockerCli) (*DryRunClient, error) {
b, err := builder.New(cli, builder.WithSkippedValidation())
if err != nil {
return nil, err
}
configFile, err := b.ImageOpt()
if err != nil {
return nil, err
}
return &DryRunClient{
apiClient: apiClient,
execs: sync.Map{},
}
resolver: imagetools.New(configFile),
}, nil
}

// All methods and functions which need to be overridden for dry run.
Expand Down Expand Up @@ -129,8 +143,16 @@ func (d *DryRunClient) ImageBuild(ctx context.Context, reader io.Reader, options
return moby.ImageBuildResponse{}, ErrNotImplemented
}

func (d *DryRunClient) ImageInspectWithRaw(ctx context.Context, imageName string) (moby.ImageInspect, []byte, error) {
return moby.ImageInspect{ID: "dryRunId"}, nil, nil
}

func (d *DryRunClient) ImagePull(ctx context.Context, ref string, options moby.ImagePullOptions) (io.ReadCloser, error) {
return nil, ErrNotImplemented
if _, _, err := d.resolver.Resolve(ctx, ref); err != nil {
return nil, err
}
rc := io.NopCloser(strings.NewReader(""))
return rc, nil
}

func (d *DryRunClient) ImagePush(ctx context.Context, ref string, options moby.ImagePushOptions) (io.ReadCloser, error) {
Expand Down Expand Up @@ -304,10 +326,6 @@ func (d *DryRunClient) ImageImport(ctx context.Context, source moby.ImageImportS
return d.apiClient.ImageImport(ctx, source, ref, options)
}

func (d *DryRunClient) ImageInspectWithRaw(ctx context.Context, imageName string) (moby.ImageInspect, []byte, error) {
return d.apiClient.ImageInspectWithRaw(ctx, imageName)
}

func (d *DryRunClient) ImageList(ctx context.Context, options moby.ImageListOptions) ([]moby.ImageSummary, error) {
return d.apiClient.ImageList(ctx, options)
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/compose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ func (s *composeService) DryRunMode(ctx context.Context, dryRun bool) (context.C
return ctx, err
}
err = cli.Initialize(flags.NewClientOptions(), command.WithInitializeClient(func(cli *command.DockerCli) (client.APIClient, error) {
dryRunClient := api.NewDryRunClient(s.apiClient())
return dryRunClient, nil
return api.NewDryRunClient(s.apiClient(), cli)
}))
if err != nil {
return ctx, err
Expand Down
7 changes: 7 additions & 0 deletions pkg/compose/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ func (s *composeService) pull(ctx context.Context, project *types.Project, opts
mustBuild = append(mustBuild, service.Name)
}
if !opts.IgnoreFailures && service.Build == nil {
if s.dryRun {
w.Event(progress.Event{
ID: service.Name,
Status: progress.Error,
Text: fmt.Sprintf(" - Pull error for image: %s", service.Image),
milas marked this conversation as resolved.
Show resolved Hide resolved
})
}
// fail fast if image can't be pulled nor built
return err
}
Expand Down