From 2002204ce9c27f67fa459d438d836ad66a0db671 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 17 Apr 2025 11:24:29 +0200 Subject: [PATCH] cli/command/container: createContainer: move fn closer to where used The "use-api-socket" code got in between, putting a lot of distance between the declaration and use. Signed-off-by: Sebastiaan van Stijn --- cli/command/container/create.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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