fix: argument passing & skipContainerEnv

Author: FabianKramm

cmd/run_pipeline.go

@@ -147,7 +147,7 @@ func (cmd *RunPipelineCmd) Run(cobraCmd *cobra.Command, args []string, f factory
 	// Print upgrade message if new version available
 	if !cmd.Render {
 		upgrade.PrintUpgradeMessage(cmd.log)
-	} else {
+	} else if cmd.RenderWriter == nil {
 		cmd.RenderWriter = os.Stdout
 	}
 

helper/cmd/proxy_commands/configure.go

@@ -56,7 +56,7 @@ func (cmd *ConfigureCmd) Run(_ *cobra.Command, _ []string) error {
 	for _, c := range cmd.Commands {
 		filePath := "/usr/local/bin/" + c
 		executeCommand := fmt.Sprintf(`#!/bin/sh
-/tmp/devspacehelper proxy-commands run %s $@`, c)
+/tmp/devspacehelper proxy-commands run %s "$@"`, c)
 		err := ioutil.WriteFile(filePath, []byte(executeCommand), 0777)
 		if err != nil {
 			return fmt.Errorf("error writing command '%s': %v", filePath, err)

pkg/devspace/config/versions/latest/schema.go

@@ -867,6 +867,9 @@ type ProxyCommand struct {
 	// LocalCommand can be used to run a different command than specified via the command option. By
 	// default, this will be assumed to be the same as command.
 	LocalCommand string `yaml:"localCommand,omitempty" json:"localCommand,omitempty"`
+
+	// SkipContainerEnv will not forward the container environment variables to the local command
+	SkipContainerEnv bool `yaml:"skipContainerEnv,omitempty" json:"skipContainerEnv,omitempty"`
 }
 
 type SSH struct {

pkg/devspace/services/proxycommands/server.go

@@ -176,7 +176,9 @@ func (s *Server) getCommand(sess ssh.Session) (*exec.Cmd, *types.ProxyCommand, e
 	}
 
 	s.log.Debugf("run command '%s %s' locally", c, strings.Join(args, " "))
-	cmd.Env = append(cmd.Env, command.Env...)
+	if !reverseCommand.SkipContainerEnv {
+		cmd.Env = append(cmd.Env, command.Env...)
+	}
 	cmd.Env = append(cmd.Env, os.Environ()...)
 	return cmd, command, nil
 }