tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-05-29 19:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

e2e: fix per-command env overrides

Browse Source 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2022-06-16 11:27:34 -04:00
parent ccd87311e8
commit a261682ca8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/e2e/compose_environment_test.go
View File

@ -45,7 +45,8 @@ func TestEnvPriority(t *testing.T) {
cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-priority/compose-with-env.yaml", cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-priority/compose-with-env.yaml",
"--project-directory", projectDir, "--env-file", "./fixtures/environment/env-priority/.env.override", "run", "--project-directory", projectDir, "--env-file", "./fixtures/environment/env-priority/.env.override", "run",
"--rm", "-e", "WHEREAMI", "env-compose-priority") "--rm", "-e", "WHEREAMI", "env-compose-priority")
res := icmd.RunCmd(cmd, icmd.WithEnv("WHEREAMI=shell")) cmd.Env = append(cmd.Env, "WHEREAMI=shell")
res := icmd.RunCmd(cmd)
assert.Equal(t, strings.TrimSpace(res.Stdout()), "Compose File") assert.Equal(t, strings.TrimSpace(res.Stdout()), "Compose File")
}) })
@ -59,7 +60,8 @@ func TestEnvPriority(t *testing.T) {
cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-priority/compose.yaml", "--project-directory", cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-priority/compose.yaml", "--project-directory",
projectDir, "--env-file", "./fixtures/environment/env-priority/.env.override", "run", "--rm", "-e", projectDir, "--env-file", "./fixtures/environment/env-priority/.env.override", "run", "--rm", "-e",
"WHEREAMI", "env-compose-priority") "WHEREAMI", "env-compose-priority")
res := icmd.RunCmd(cmd, icmd.WithEnv("WHEREAMI=shell")) cmd.Env = append(cmd.Env, "WHEREAMI=shell")
res := icmd.RunCmd(cmd)
assert.Equal(t, strings.TrimSpace(res.Stdout()), "shell") assert.Equal(t, strings.TrimSpace(res.Stdout()), "shell")
}) })
@ -133,7 +135,8 @@ func TestEnvInterpolation(t *testing.T) {
t.Run("shell priority from run command", func(t *testing.T) { t.Run("shell priority from run command", func(t *testing.T) {
cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-interpolation/compose.yaml", cmd := c.NewDockerComposeCmd(t, "-f", "./fixtures/environment/env-interpolation/compose.yaml",
"--project-directory", projectDir, "config") "--project-directory", projectDir, "config")
res := icmd.RunCmd(cmd, icmd.WithEnv("WHEREAMI=shell")) cmd.Env = append(cmd.Env, "WHEREAMI=shell")
res := icmd.RunCmd(cmd)
res.Assert(t, icmd.Expected{Out: `IMAGE: default_env:shell`}) res.Assert(t, icmd.Expected{Out: `IMAGE: default_env:shell`})
}) })
} }