From 10a615e9e994e94b48f9dae2e63d1325e2e67155 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 17 Aug 2022 22:36:25 +0200 Subject: [PATCH] Give environment variables precedence back to OS over .env Signed-off-by: Ulysses Souza --- cmd/compose/compose.go | 6 ++++-- go.mod | 2 +- go.sum | 4 ++-- pkg/e2e/compose_environment_test.go | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 10d11088409..133897b4f88 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -383,8 +383,10 @@ func setEnvWithDotEnv(prjOpts *projectOptions) error { return err } for k, v := range envFromFile { - if err := os.Setenv(k, v); err != nil { // overwrite the process env with merged OS + env file results - return err + if _, ok := os.LookupEnv(k); !ok { + if err := os.Setenv(k, v); err != nil { + return err + } } } return nil diff --git a/go.mod b/go.mod index 037e4dbea26..da18fccde7b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.5 github.com/buger/goterm v1.0.4 github.com/cnabio/cnab-to-oci v0.3.6 - github.com/compose-spec/compose-go v1.4.0 + github.com/compose-spec/compose-go v1.5.0 github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.6.8 github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f diff --git a/go.sum b/go.sum index 7f70feca9ab..8bf98b8d66a 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/compose-spec/compose-go v1.2.1/go.mod h1:pAy7Mikpeft4pxkFU565/DRHEbDfR84G6AQuiL+Hdg8= -github.com/compose-spec/compose-go v1.4.0 h1:zaYVAZ6lIByr7Jffi20AabfeUwcTrdXfH3X1R5HEm+g= -github.com/compose-spec/compose-go v1.4.0/go.mod h1:l7RUULbFFLzlQHuxtJr7SVLyWdqEpbJEGTWCgcu6Eqw= +github.com/compose-spec/compose-go v1.5.0 h1:yOmYpIm13pYt2o+oKVe/JAD6o2Tv+eUyOcRhf0qF4fA= +github.com/compose-spec/compose-go v1.5.0/go.mod h1:l7RUULbFFLzlQHuxtJr7SVLyWdqEpbJEGTWCgcu6Eqw= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= diff --git a/pkg/e2e/compose_environment_test.go b/pkg/e2e/compose_environment_test.go index c57b58077dc..a0cfca86353 100644 --- a/pkg/e2e/compose_environment_test.go +++ b/pkg/e2e/compose_environment_test.go @@ -34,7 +34,7 @@ func TestEnvPriority(t *testing.T) { }) // Full options activated - // 1. Command Line (docker compose run --env ) <-- Result expected (From environment patched by --env-file) + // 1. Command Line (docker compose run --env ) <-- Result expected (From OS Environment) // 2. Compose File (service::environment section) // 3. Compose File (service::env_file section file) // 4. Container Image ENV directive @@ -45,7 +45,7 @@ func TestEnvPriority(t *testing.T) { "run", "--rm", "-e", "WHEREAMI", "env-compose-priority") cmd.Env = append(cmd.Env, "WHEREAMI=shell") res := icmd.RunCmd(cmd) - assert.Equal(t, strings.TrimSpace(res.Stdout()), "override") + assert.Equal(t, strings.TrimSpace(res.Stdout()), "shell") }) // Full options activated @@ -63,7 +63,7 @@ func TestEnvPriority(t *testing.T) { }) // No Compose file, all other options - // 1. Command Line (docker compose run --env ) <-- Result expected (From environment patched by --env-file) + // 1. Command Line (docker compose run --env ) <-- Result expected (From OS Environment) // 2. Compose File (service::environment section) // 3. Compose File (service::env_file section file) // 4. Container Image ENV directive @@ -74,7 +74,7 @@ func TestEnvPriority(t *testing.T) { "run", "--rm", "-e", "WHEREAMI", "env-compose-priority") cmd.Env = append(cmd.Env, "WHEREAMI=shell") res := icmd.RunCmd(cmd) - assert.Equal(t, strings.TrimSpace(res.Stdout()), "override") + assert.Equal(t, strings.TrimSpace(res.Stdout()), "shell") }) // No Compose file, all other options with env variable from OS environment