feat(compose): accept env vars [EE-4538] (#29)

Author: chiptus

compose/internal/composeplugin/composeplugin.go

@@ -37,8 +37,8 @@ func (wrapper *PluginWrapper) Deploy(ctx context.Context, filePaths []string, op
 	output, err := wrapper.command(newUpCommand(filePaths, upOptions{
 		forceRecreate:        options.ForceRecreate,
 		abortOnContainerExit: options.AbortOnContainerExit,
-	}), options.Options,
-	)
+	}), options.Options)
+
 	if len(output) != 0 {
 		if err != nil {
 			return err
@@ -118,11 +118,22 @@ func (wrapper *PluginWrapper) command(command composeCommand, options libstack.O
 	cmd := exec.Command(program, args...)
 	cmd.Dir = options.WorkingDir
 
-	if wrapper.configPath != "" {
+	if wrapper.configPath != "" || len(options.Env) > 0 {
 		cmd.Env = os.Environ()
+	}
+
+	if wrapper.configPath != "" {
 		cmd.Env = append(cmd.Env, "DOCKER_CONFIG="+wrapper.configPath)
 	}
 
+	cmd.Env = append(cmd.Env, options.Env...)
+
+	log.Debug().
+		Str("command", program).
+		Strs("args", args).
+		Interface("env", cmd.Env).
+		Msg("run command")
+
 	cmd.Stderr = &stderr
 
 	output, err := cmd.Output()
@@ -159,7 +170,7 @@ func newCommand(command []string, filePaths []string) composeCommand {
 
 type upOptions struct {
 	forceRecreate        bool
-	abortOnContainerExit bool ``
+	abortOnContainerExit bool
 }
 
 func newUpCommand(filePaths []string, options upOptions) composeCommand {

libstack.go

@@ -14,7 +14,10 @@ type Options struct {
 	WorkingDir  string
 	Host        string
 	ProjectName string
+	// EnvFilePath is the path to a .env file
 	EnvFilePath string
+	// Env is a list of environment variables to pass to the command, example: "FOO=bar"
+	Env []string
 }
 
 type DeployOptions struct {