@@ -402,7 +402,7 @@ async def assert_volume(compose, mount_dict):
402402 log .debug ("podman volume inspect %s || podman volume create %s" , vol_name , vol_name )
403403 # TODO: might move to using "volume list"
404404 # podman volume list --format '{{.Name}}\t{{.MountPoint}}' \
405- # -f f"label={compose.label_domain}.project=HERE"
405+ # -f f"label={compose.label_domain}.compose. project=HERE"
406406 try :
407407 _ = (await compose .podman .output ([], "volume" , ["inspect" , vol_name ])).decode ("utf-8" )
408408 except subprocess .CalledProcessError as e :
@@ -1458,7 +1458,7 @@ async def volume_ls(self, proj_name=None):
14581458 "ls" ,
14591459 "--noheading" ,
14601460 "--filter" ,
1461- f"label={ self .compose . label_domain } .compose.project={ proj_name } " ,
1461+ f"label={ self .label_domain } .compose.project={ proj_name } " ,
14621462 "--format" ,
14631463 "{{.Name}}" ,
14641464 ],
@@ -1836,7 +1836,9 @@ def _parse_compose_file(self):
18361836 env_vars = norm_as_dict (args .env )
18371837 self .environ .update (env_vars )
18381838
1839- compose = {}
1839+ compose = {
1840+ label_domain : label_domain ,
1841+ }
18401842 # Iterate over files primitively to allow appending to files in-loop
18411843 files_iter = iter (files )
18421844
@@ -2509,10 +2511,10 @@ async def compose_up(compose: PodmanCompose, args):
25092511 "ps" ,
25102512 [
25112513 "--filter" ,
2512- f"label={ compose .label_domain } .compose.project={ compose .project_name } " ,
2514+ f"label={ args .label_domain } .compose.project={ compose .project_name } " ,
25132515 "-a" ,
25142516 "--format" ,
2515- '{{ index .Labels "' + compose .label_domain + '.compose.config-hash"}}' ,
2517+ '{{ index .Labels "' + args .label_domain + '.compose.config-hash"}}' ,
25162518 ],
25172519 )
25182520 )
@@ -2657,7 +2659,7 @@ async def compose_down(compose, args):
26572659 "ps" ,
26582660 [
26592661 "--filter" ,
2660- f"label={ compose .label_domain } .compose.project={ compose .project_name } " ,
2662+ f"label={ args .label_domain } .compose.project={ compose .project_name } " ,
26612663 "-a" ,
26622664 "--format" ,
26632665 "{{ .Names }}" ,
@@ -2694,7 +2696,7 @@ async def compose_ps(compose, args):
26942696 ps_args = [
26952697 "-a" ,
26962698 "--filter" ,
2697- f"label={ compose .label_domain } .compose.project={ compose .project_name } " ,
2699+ f"label={ args .label_domain } .compose.project={ compose .project_name } " ,
26982700 ]
26992701 if args .quiet is True :
27002702 ps_args .extend (["--format" , "{{.ID}}" ])
0 commit comments