Skip to content

Commit 2002204

Browse files
committed
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 <github@gone.nl>
1 parent 4d8c241 commit 2002204

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

cli/command/container/create.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,6 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
240240
}
241241
}
242242

243-
pullAndTagImage := func() error {
244-
if err := pullImage(ctx, dockerCli, config.Image, options); err != nil {
245-
return err
246-
}
247-
if taggedRef, ok := namedRef.(reference.NamedTagged); ok && trustedRef != nil {
248-
return trust.TagTrusted(ctx, dockerCli.Client(), dockerCli.Err(), trustedRef, taggedRef)
249-
}
250-
return nil
251-
}
252-
253243
const dockerConfigPathInContainer = "/run/secrets/docker/config.json"
254244
var apiSocketCreds map[string]types.AuthConfig
255245

@@ -331,6 +321,16 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
331321
platform = &p
332322
}
333323

324+
pullAndTagImage := func() error {
325+
if err := pullImage(ctx, dockerCli, config.Image, options); err != nil {
326+
return err
327+
}
328+
if taggedRef, ok := namedRef.(reference.NamedTagged); ok && trustedRef != nil {
329+
return trust.TagTrusted(ctx, dockerCli.Client(), dockerCli.Err(), trustedRef, taggedRef)
330+
}
331+
return nil
332+
}
333+
334334
if options.pull == PullImageAlways {
335335
if err := pullAndTagImage(); err != nil {
336336
return "", err

0 commit comments

Comments
 (0)