cli/command/image: remove errStdinConflict

thaJeztah · thaJeztah · commit 77dd05caad3b · 2023-06-13T13:47:56.000+02:00
This error was only used in a single location, so no need to define a
package-level variable for this.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/image/build.go b/cli/command/image/build.go
@@ -34,8 +34,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var errStdinConflict = errors.New("invalid argument: can't use stdin for both build context and dockerfile")
-
 type buildOptions struct {
 	context        string
 	dockerfileName string
@@ -189,7 +187,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
 
 	if options.dockerfileFromStdin() {
 		if options.contextFromStdin() {
-			return errStdinConflict
+			return errors.New("invalid argument: can't use stdin for both build context and dockerfile")
 		}
 		dockerfileCtx = dockerCli.In()
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ import (`
`34`	`34`	`"github.com/spf13/cobra"`
`35`	`35`	`)`
`36`	`36`
`37`		`-var errStdinConflict = errors.New("invalid argument: can't use stdin for both build context and dockerfile")`
`38`		`-`
`39`	`37`	`type buildOptions struct {`
`40`	`38`	`context string`
`41`	`39`	`dockerfileName string`
`@@ -189,7 +187,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {`
`189`	`187`
`190`	`188`	`if options.dockerfileFromStdin() {`
`191`	`189`	`if options.contextFromStdin() {`
`192`		`- return errStdinConflict`
	`190`	`+ return errors.New("invalid argument: can't use stdin for both build context and dockerfile")`
`193`	`191`	`}`
`194`	`192`	`dockerfileCtx = dockerCli.In()`
`195`	`193`	`}`