Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4943 from jsternberg/correct-build-command-path 

builder: correct the command path for docker build
This commit is contained in:
Sebastiaan van Stijn 2024-03-16 15:30:43 +01:00 committed by GitHub
parent 4e9abfecf5 9392831817
commit 38fcd1ca63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/docker/builder.go
View File

@ -69,7 +69,7 @@ func processBuilder(dockerCli command.Cli, cmd *cobra.Command, args, osargs []st
} }
// is this a build that should be forwarded to the builder? // is this a build that should be forwarded to the builder?
fwargs, fwosargs, alias, forwarded := forwardBuilder(builderAlias, args, osargs) fwargs, fwosargs, fwcmdpath, forwarded := forwardBuilder(builderAlias, args, osargs)
if !forwarded { if !forwarded {
return args, osargs, nil, nil return args, osargs, nil, nil
} }
@ -117,33 +117,37 @@ func processBuilder(dockerCli command.Cli, cmd *cobra.Command, args, osargs []st
} }
// overwrite the command path for this plugin using the alias name. // overwrite the command path for this plugin using the alias name.
cmd.Annotations[pluginmanager.CommandAnnotationPluginCommandPath] = fmt.Sprintf("%s %s", cmd.CommandPath(), alias) cmd.Annotations[pluginmanager.CommandAnnotationPluginCommandPath] = strings.Join(append([]string{cmd.CommandPath()}, fwcmdpath...), " ")
return fwargs, fwosargs, envs, nil return fwargs, fwosargs, envs, nil
} }
func forwardBuilder(alias string, args, osargs []string) ([]string, []string, string, bool) { func forwardBuilder(alias string, args, osargs []string) ([]string, []string, []string, bool) {
aliases := [][2][]string{ aliases := [][3][]string{
{ {
{"builder"}, {"builder"},
{alias}, {alias},
{"builder"},
}, },
{ {
{"build"}, {"build"},
{alias, "build"}, {alias, "build"},
{},
}, },
{ {
{"image", "build"}, {"image", "build"},
{alias, "build"}, {alias, "build"},
{"image"},
}, },
} }
for _, al := range aliases { for _, al := range aliases {
if fwargs, changed := command.StringSliceReplaceAt(args, al[0], al[1], 0); changed { if fwargs, changed := command.StringSliceReplaceAt(args, al[0], al[1], 0); changed {
fwosargs, _ := command.StringSliceReplaceAt(osargs, al[0], al[1], -1) fwosargs, _ := command.StringSliceReplaceAt(osargs, al[0], al[1], -1)
return fwargs, fwosargs, al[0][0], true fwcmdpath := al[2]
return fwargs, fwosargs, fwcmdpath, true
} }
} }
return args, osargs, "", false return args, osargs, nil, false
} }
// hasBuilderName checks if a builder name is defined in args or env vars // hasBuilderName checks if a builder name is defined in args or env vars