Fix environment variable precedents

Per https://docs.docker.com/compose/environment-variables/envvars-precedence/#advanced-example Signed-off-by: nathanael.noblet <nathanael.noblet@willowglensystems.com>
wgnathanael · Jun 22, 2024 · 935029d · 935029d
1 parent 80b2aa6
commit 935029d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/podman_compose.py b/podman_compose.py
@@ -1804,8 +1804,8 @@ def _parse_compose_file(self):
         os.environ.update({
             key: value for key, value in dotenv_dict.items() if key.startswith("PODMAN_")
         })
-        self.environ = dict(os.environ)
-        self.environ.update(dotenv_dict)
+        self.environ = dotenv_dict
+        self.environ.update(dict(os.environ))
         # see: https://docs.docker.com/compose/reference/envvars/
         # see: https://docs.docker.com/compose/env-file/
         self.environ.update({

diff --git a/tests/env-file-tests/README.md b/tests/env-file-tests/README.md
@@ -19,3 +19,9 @@ podman-compose -f $(pwd)/project/container-compose.env-file-obj.yaml up
 ```
 podman-compose -f $(pwd)/project/container-compose.env-file-obj-optional.yaml up
 ```
+
+based on environment variable precedent this command should give podman-rocks-321
+
+```
+ZZVAR1=podman-rocks-321 podman-compose -f $(pwd)/project/container-compose.yaml --env-file $(pwd)/env-files/project-1.env up
+```