extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2024-11-22 16:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-order environment/env_files to match compose

Browse Source 
docker-compose reads the 'env_files' and adds the content as
environment values before adding the 'environment' data. This
means that that 'environment' data overrides 'env_files' data.
Emulate this behaviour by re-ordering -e statements to end up
after --env-file statements.

Relevant function in docker-compose can be viewed here:
https://github.com/docker/compose/blob/1.27.4/compose/config/config.py#L694-L697
This commit is contained in:
Jonas Eriksson 2020-10-08 13:34:02 +02:00 committed by Muayyad Alsadi
parent 20a86ea563
commit 497355fcfb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
podman_compose.py
View File

@ -524,20 +524,20 @@ def container_to_args(compose, cnt, detached=True, podman_command='run'):
net = cnt.get("network_mode", None)
if net:
podman_args.extend(['--network', net])
env = norm_as_list(cnt.get('environment', {}))
for c in cnt.get('cap_add', []):
podman_args.extend(['--cap-add', c])
for c in cnt.get('cap_drop', []):
podman_args.extend(['--cap-drop', c])
for d in cnt.get('devices', []):
podman_args.extend(['--device', d])
for e in env:
podman_args.extend(['-e', e])
env_file = cnt.get('env_file', [])
if is_str(env_file): env_file = [env_file]
for i in env_file:
i = os.path.realpath(os.path.join(dirname, i))
podman_args.extend(['--env-file', i])
env = norm_as_list(cnt.get('environment', {}))
for e in env:
podman_args.extend(['-e', e])
tmpfs_ls = cnt.get('tmpfs', [])
if is_str(tmpfs_ls): tmpfs_ls = [tmpfs_ls]
for i in tmpfs_ls: