holm/podman-compose
1
0
Fork 0
forked from extern/podman-compose
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify volume identification

Browse Source 
The filtering provided by "volume ls" did not work as expected
in previous versions of podman:
https://github.com/containers/podman/pull/8345

Verified that this now works properly on podman 3.4.4

Signed-off-by: Luiz Carvalho <lucarval@redhat.com>
This commit is contained in:
Luiz Carvalho 2022-01-06 09:54:37 -05:00 committed by Muayyad Alsadi
parent 890c584881
commit af53b65068
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
podman_compose.py
View File

@ -857,16 +857,15 @@ class Podman:
time.sleep(sleep)
return p
def volume_inspect_all(self):
output = self.output([], "volume", ["inspect", "--all"]).decode('utf-8')
return json.loads(output)
def volume_inspect_proj(self, proj=None):
def volume_ls(self, proj=None):
if not proj:
proj = self.compose.project_name
volumes = [(vol.get("Labels", {}), vol) for vol in self.volume_inspect_all()]
volumes = [(labels.get("io.podman.compose.project", None), vol) for labels, vol in volumes]
return [vol for vol_proj, vol in volumes if vol_proj==proj]
output = self.output([], "volume", [
"ls", "--noheading", "--filter", f"label=io.podman.compose.project={proj}",
"--format", "{{.Name}}",
]).decode('utf-8')
volumes = output.splitlines()
return volumes
def normalize_service(service):
for key in ("env_file", "security_opt", "volumes"):
@ -1510,8 +1509,7 @@ def compose_down(compose, args):
if cnt["_service"] not in excluded: continue
vol_names_to_keep.update(get_volume_names(compose, cnt))
log("keep", vol_names_to_keep)
volume_names = [vol["Name"] for vol in compose.podman.volume_inspect_proj()]
for volume_name in volume_names:
for volume_name in compose.podman.volume_ls():
if volume_name in vol_names_to_keep: continue
compose.podman.run([], "volume", ["rm", volume_name])