diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 8d29cbf2a5..1dbc8a69eb 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -240,16 +240,6 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c } } - pullAndTagImage := func() error { - if err := pullImage(ctx, dockerCli, config.Image, options); err != nil { - return err - } - if taggedRef, ok := namedRef.(reference.NamedTagged); ok && trustedRef != nil { - return trust.TagTrusted(ctx, dockerCli.Client(), dockerCli.Err(), trustedRef, taggedRef) - } - return nil - } - const dockerConfigPathInContainer = "/run/secrets/docker/config.json" var apiSocketCreds map[string]types.AuthConfig @@ -331,6 +321,16 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c platform = &p } + pullAndTagImage := func() error { + if err := pullImage(ctx, dockerCli, config.Image, options); err != nil { + return err + } + if taggedRef, ok := namedRef.(reference.NamedTagged); ok && trustedRef != nil { + return trust.TagTrusted(ctx, dockerCli.Client(), dockerCli.Err(), trustedRef, taggedRef) + } + return nil + } + if options.pull == PullImageAlways { if err := pullAndTagImage(); err != nil { return "", err