fix(run): --bash and --shell depend on image entrypoint

alexey-igrychev · alexey-igrychev · commit c2369f6041c7 · 2022-09-08T23:48:02.000+01:00
Signed-off-by: Alexey Igrychev &lt;alexey.igrychev@flant.com&gt;
diff --git a/cmd/werf/run/run.go b/cmd/werf/run/run.go
@@ -95,11 +95,11 @@ func NewCmd(ctx context.Context) *cobra.Command {
 				if len(cmdData.DockerOptions) == 0 && len(cmdData.DockerCommand) == 0 {
 					cmdData.DockerOptions = []string{"-ti", "--rm"}
 					if cmdData.Shell {
-						cmdData.DockerCommand = []string{"/bin/sh"}
+						cmdData.DockerOptions = append(cmdData.DockerOptions, "--entrypoint=/bin/sh")
 					}
 
 					if cmdData.Bash {
-						cmdData.DockerCommand = []string{"/bin/bash"}
+						cmdData.DockerOptions = append(cmdData.DockerOptions, "--entrypoint=/bin/bash")
 					}
 				} else {
 					common.PrintHelp(cmd)

Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,11 @@ func NewCmd(ctx context.Context) *cobra.Command {`
`95`	`95`	`if len(cmdData.DockerOptions) == 0 && len(cmdData.DockerCommand) == 0 {`
`96`	`96`	`cmdData.DockerOptions = []string{"-ti", "--rm"}`
`97`	`97`	`if cmdData.Shell {`
`98`		`- cmdData.DockerCommand = []string{"/bin/sh"}`
	`98`	`+ cmdData.DockerOptions = append(cmdData.DockerOptions, "--entrypoint=/bin/sh")`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if cmdData.Bash {`
`102`		`- cmdData.DockerCommand = []string{"/bin/bash"}`
	`102`	`+ cmdData.DockerOptions = append(cmdData.DockerOptions, "--entrypoint=/bin/bash")`
`103`	`103`	`}`
`104`	`104`	`} else {`
`105`	`105`	`common.PrintHelp(cmd)`