extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-02-05 21:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

expand service environment_variables before adding to subs_dict

Browse Source 
Also modifies an existing integration test to expect an empty string as `docker-compose` warns that
`ZZVAR3` is not set and defaults it to an empty string per the acutal output here.

```yaml
$ docker-compose -f container-compose.load-.env-in-project.yaml config
WARN[0000] The "ZZVAR3" variable is not set. Defaulting to a blank string.
name: project
services:
  app:
    command:
      - /bin/busybox
      - sh
      - -c
      - env | grep ZZ
    environment:
      ZZVAR1: This value is loaded but should be overwritten
      ZZVAR2: This value is loaded from .env in project/ directory
      ZZVAR3: ""
...
```

Signed-off-by: indra <indra.talip@gmail.com>
This commit is contained in:
indra 2025-01-16 10:36:34 +11:00
parent a177603661
commit 2aa042b9c7
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
podman_compose.py
View File

@ -270,7 +270,6 @@ def rec_subs(value, subs_dict):
svc_envs = {k: v for k, v in value['environment'].items() if k not in subs_dict}
# we need to add `svc_envs` to the `subs_dict` so that it can evaluate the
# service environment that reference to another service environment.
subs_dict.update(svc_envs)
svc_envs = rec_subs(svc_envs, subs_dict)
subs_dict.update(svc_envs)

2
tests/integration/test_podman_compose_env_file.py
View File

@ -233,7 +233,7 @@ class TestComposeEnvFile(unittest.TestCase, RunSubprocessMixin):
[
'ZZVAR1=This value is loaded but should be overwritten\r',
'ZZVAR2=This value is loaded from .env in project/ directory\r',
'ZZVAR3=$ZZVAR3\r',
'ZZVAR3=\r',
'',
],
)

10
tests/unit/test_rec_subs.py
View File

@ -26,6 +26,16 @@ class TestRecSubs(unittest.TestCase):
{"environment": {"non_var": "$$v1", "vx": "$non_var"}, "image": "abc:$non_var"},
{"environment": {"non_var": "$v1", "vx": "$v1"}, "image": "abc:$v1"},
),
(
"service environment with unpopulated ${VARIABLE:-default} format",
{"environment": {"v100": "${v100:-low priority}", "actual-v100": "$v100"}},
{"environment": {"v100": "low priority", "actual-v100": "low priority"}},
),
(
"service environment with populated ${VARIABLE:-default} format",
{"environment": {"v1": "${v1:-low priority}", "actual-v1": "$v1"}},
{"environment": {"v1": "high priority", "actual-v1": "high priority"}},
),
# list
(
"Values in list are substituted",