From bac398aa9fe77d3b17cd0962b104bf2b00306870 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 2 Jun 2022 16:33:26 +0200 Subject: [PATCH] Fix .env and --envfile priorities Signed-off-by: Ulysses Souza --- pkg/e2e/compose_environment_test.go | 13 +++++++++++++ .../env-priority/compose-with-env-file.yaml | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 pkg/e2e/fixtures/environment/env-priority/compose-with-env-file.yaml diff --git a/pkg/e2e/compose_environment_test.go b/pkg/e2e/compose_environment_test.go index 3314617c..38673928 100644 --- a/pkg/e2e/compose_environment_test.go +++ b/pkg/e2e/compose_environment_test.go @@ -78,6 +78,19 @@ func TestEnvPriority(t *testing.T) { assert.Equal(t, strings.TrimSpace(res.Stdout()), "shell-run") }) + // No Compose file & no env variable but override env file + // 1. Compose file + // 2. Shell environment variables + // 3. Environment file <-- Result expected + // 4. Dockerfile + // 5. Variable is not defined + t.Run("override env file from compose", func(t *testing.T) { + res := c.RunDockerComposeCmd("-f", "./fixtures/environment/env-priority/compose-with-env-file.yaml", + "--project-directory", projectDir, + "run", "--rm", "-e", "WHEREAMI", "env-compose-priority") + assert.Equal(t, strings.TrimSpace(res.Stdout()), "override") + }) + // No Compose file & no env variable but override env file // 1. Compose file // 2. Shell environment variables diff --git a/pkg/e2e/fixtures/environment/env-priority/compose-with-env-file.yaml b/pkg/e2e/fixtures/environment/env-priority/compose-with-env-file.yaml new file mode 100644 index 00000000..4659830f --- /dev/null +++ b/pkg/e2e/fixtures/environment/env-priority/compose-with-env-file.yaml @@ -0,0 +1,7 @@ +services: + env-compose-priority: + image: env-compose-priority + build: + context: . + env_file: + - .env.override