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

Changed -l flag to --label in order to be compatible with Podman 1.0.2.dev

Browse Source
This commit is contained in:
Lorenzo Benvenuti 2019-10-01 12:06:50 +02:00 committed by Muayyad Alsadi
parent c152d28af7
commit 62f0cc492c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
podman_compose.py
View File

@ -376,7 +376,7 @@ def mount_dict_vol_to_bind(compose, mount_dict):
# podman volume list --format '{{.Name}}\t{{.MountPoint}}' -f 'label=io.podman.compose.project=HERE' # podman volume list --format '{{.Name}}\t{{.MountPoint}}' -f 'label=io.podman.compose.project=HERE'
try: out = compose.podman.output(["volume", "inspect", vol_name]).decode('utf-8') try: out = compose.podman.output(["volume", "inspect", vol_name]).decode('utf-8')
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
compose.podman.output(["volume", "create", "-l", "io.podman.compose.project={}".format(proj_name), vol_name]) compose.podman.output(["volume", "create", "--label", "io.podman.compose.project={}".format(proj_name), vol_name])
out = compose.podman.output(["volume", "inspect", vol_name]).decode('utf-8') out = compose.podman.output(["volume", "inspect", vol_name]).decode('utf-8')
src = json.loads(out)[0]["mountPoint"] src = json.loads(out)[0]["mountPoint"]
ret=dict(mount_dict, type="bind", source=src, _vol=vol_name) ret=dict(mount_dict, type="bind", source=src, _vol=vol_name)
@ -455,7 +455,7 @@ def container_to_args(compose, cnt, detached=True, podman_command='run'):
if cnt.get('read_only'): if cnt.get('read_only'):
podman_args.append('--read-only') podman_args.append('--read-only')
for i in cnt.get('labels', []): for i in cnt.get('labels', []):
podman_args.extend(['-l', i]) podman_args.extend(['--label', i])
net = cnt.get("network_mode") net = cnt.get("network_mode")
if net: if net:
podman_args.extend(['--network', net]) podman_args.extend(['--network', net])