servicedeployer/compose.go - pass env vars when signalling (#1115)

andrewkroh · web-flow · commit bddde65fa20b · 2023-01-26T03:24:56.000-05:00
Pass environment variables when invoking docker-compose to send a signal to a service. Fixes #1114
diff --git a/internal/testrunner/runners/system/servicedeployer/compose.go b/internal/testrunner/runners/system/servicedeployer/compose.go
@@ -135,7 +135,12 @@ func (s *dockerComposeDeployedService) Signal(signal string) error {
 		return errors.Wrap(err, "could not create Docker Compose project for service")
 	}
 
-	opts := compose.CommandOptions{ExtraArgs: []string{"-s", signal}}
+	opts := compose.CommandOptions{
+		Env: append(
+			[]string{fmt.Sprintf("%s=%s", serviceLogsDirEnv, s.ctxt.Logs.Folder.Local)},
+			s.sv.Env...),
+		ExtraArgs: []string{"-s", signal},
+	}
 	if s.ctxt.Name != "" {
 		opts.Services = append(opts.Services, s.ctxt.Name)
 	}

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,12 @@ func (s *dockerComposeDeployedService) Signal(signal string) error {`
`135`	`135`	`return errors.Wrap(err, "could not create Docker Compose project for service")`
`136`	`136`	`}`
`137`	`137`
`138`		`- opts := compose.CommandOptions{ExtraArgs: []string{"-s", signal}}`
	`138`	`+ opts := compose.CommandOptions{`
	`139`	`+ Env: append(`
	`140`	`+ []string{fmt.Sprintf("%s=%s", serviceLogsDirEnv, s.ctxt.Logs.Folder.Local)},`
	`141`	`+ s.sv.Env...),`
	`142`	`+ ExtraArgs: []string{"-s", signal},`
	`143`	`+ }`
`139`	`144`	`if s.ctxt.Name != "" {`
`140`	`145`	`opts.Services = append(opts.Services, s.ctxt.Name)`
`141`	`146`	`}`