From 935029dc33039b0af9e7d35f24f32f6bbb10ec58 Mon Sep 17 00:00:00 2001 From: "nathanael.noblet" Date: Wed, 13 Sep 2023 07:32:56 -0600 Subject: [PATCH] Fix environment variable precedents Per https://docs.docker.com/compose/environment-variables/envvars-precedence/#advanced-example Signed-off-by: nathanael.noblet --- podman_compose.py | 4 ++-- tests/env-file-tests/README.md | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/podman_compose.py b/podman_compose.py index 306cac3..346fb27 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -1804,8 +1804,8 @@ class PodmanCompose: 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 index b5f4fa9..cfefd15 100644 --- 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 +```