We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 7c026f0 commit d784abaCopy full SHA for d784aba
2 files changed
internal/container/start.go
@@ -96,6 +96,13 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
96
97
tel := opts.Telemetry
98
99
+ var hostEnv []string
100
+ for _, e := range os.Environ() {
101
+ if strings.HasPrefix(e, "CI=") || (strings.HasPrefix(e, "LOCALSTACK_") && !strings.HasPrefix(e, "LOCALSTACK_AUTH_TOKEN=")) {
102
+ hostEnv = append(hostEnv, e)
103
+ }
104
105
+
106
containers := make([]runtime.ContainerConfig, len(opts.Containers))
107
for i, c := range opts.Containers {
108
image, err := c.Image()
@@ -128,10 +135,7 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
128
135
"MAIN_CONTAINER_NAME="+containerName,
129
136
)
130
137
131
- // Forward CI environment variable if set on the host
132
- if ci := os.Getenv("CI"); ci != "" {
133
- env = append(env, "CI="+ci)
134
- }
138
+ env = append(env, hostEnv...)
139
140
var binds []runtime.BindMount
141
if socketPath := rt.SocketPath(); socketPath != "" {
internal/container/start_test.go
@@ -72,22 +72,20 @@ func TestForwardCIEnvVariable(t *testing.T) {
72
defer os.Setenv("CI", originalCI)
73
74
tests := []struct {
75
- name string
76
- ciValue string
77
- wantCI bool
78
- wantCIVals []string
+ name string
+ ciValue string
+ wantCI bool
79
}{
80
- {"CI=true", "true", true, []string{"true"}},
81
- {"CI=1", "1", true, []string{"1"}},
82
- {"CI=false", "false", true, []string{"false"}},
83
- {"CI unset", "", false, nil},
+ {"CI=true", "true", true},
+ {"CI=1", "1", true},
+ {"CI=false", "false", true},
+ {"CI unset", "", false},
84
}
85
86
for _, tt := range tests {
87
t.Run(tt.name, func(t *testing.T) {
88
os.Setenv("CI", tt.ciValue)
89
90
- // Simulate the env building logic from start.go:136-139
91
env := []string{"LOCALSTACK_AUTH_TOKEN=test"}
92
if ci := os.Getenv("CI"); ci != "" {
93
env = append(env, "CI="+ci)
0 commit comments