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

#348: conditional --infra-name

Browse Source
This commit is contained in:
Muayyad alsadi 2021-10-24 17:35:36 +03:00
parent 2d80e435dd
commit f2aeaba0d6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
podman_compose.py
View File

@ -70,12 +70,21 @@ def try_float(i, fallback=None):
dir_re = re.compile("^[~/\.]") dir_re = re.compile("^[~/\.]")
propagation_re = re.compile("^(?:z|Z|r?shared|r?slave|r?private)$") propagation_re = re.compile("^(?:z|Z|r?shared|r?slave|r?private)$")
norm_re = re.compile('[^-_a-z0-9]') norm_re = re.compile('[^-_a-z0-9]')
num_split_re = re.compile(r'(\d+|\D+)')
PODMAN_CMDS = ( PODMAN_CMDS = (
"pull", "push", "build", "inspect", "pull", "push", "build", "inspect",
"run", "start", "stop", "rm", "volume", "run", "start", "stop", "rm", "volume",
) )
def ver_as_list(a):
return [try_int(i, i) for i in num_split_re.findall(a)]
def strverscmp_lt(a, b):
a_ls = ver_as_list(a)
b_ls = ver_as_list(b)
return a_ls < b_ls
def parse_short_mount(mount_str, basedir): def parse_short_mount(mount_str, basedir):
mount_a = mount_str.split(':') mount_a = mount_str.split(':')
mount_opt_dict = {} mount_opt_dict = {}
@ -1008,7 +1017,8 @@ class PodmanCompose:
if not args.dry_run: if not args.dry_run:
# just to make sure podman is running # just to make sure podman is running
try: try:
self.podman_version = self.podman.output(["--version"], '', []).decode('utf-8').strip() self.podman_version = self.podman.output(["--version"], '', []).decode('utf-8').strip() or ""
self.podman_version = (self.podman_version.split() or [""])[-1]
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
self.podman_version = None self.podman_version = None
if not self.podman_version: if not self.podman_version:
@ -1357,9 +1367,10 @@ def create_pods(compose, args):
podman_args = [ podman_args = [
"create", "create",
"--name={}".format(pod["name"]), "--name={}".format(pod["name"]),
"--infra-name={}_infra".format(pod["name"]),
"--share", "net", "--share", "net",
] ]
if not strverscmp_lt(compose.podman_version, "3.4.0"):
podman_args.append("--infra-name={}_infra".format(pod["name"]))
ports = pod.get("ports", None) or [] ports = pod.get("ports", None) or []
if isinstance(ports, str): if isinstance(ports, str):
ports = [ports] ports = [ports]