From 617f3e409ddda36b7ba2e2b00d3839285e63bdb1 Mon Sep 17 00:00:00 2001 From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org> Date: Sat, 5 Nov 2022 23:55:12 +0100 Subject: [PATCH] repair destroy + specifique matrix --- _podman-common/80_destroy_pod.sh | 1 - podman-matrix/80_destroy.sh | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 120000 => 100755 podman-matrix/80_destroy.sh diff --git a/_podman-common/80_destroy_pod.sh b/_podman-common/80_destroy_pod.sh index 928cae1..23d9f04 100755 --- a/_podman-common/80_destroy_pod.sh +++ b/_podman-common/80_destroy_pod.sh @@ -18,7 +18,6 @@ ${ABSDIR}/70_disable.sh rm -f ${HOME}/.config/systemd/user/${service_name} systemctl --user daemon-reload podman pod rm ${pod_name} -podman network rm ${project_name}_default for volume in ${nonpersistent_volumes}; do podman volume rm ${volume} diff --git a/podman-matrix/80_destroy.sh b/podman-matrix/80_destroy.sh deleted file mode 120000 index 1b8a370..0000000 --- a/podman-matrix/80_destroy.sh +++ /dev/null @@ -1 +0,0 @@ -../_podman-common/80_destroy_pod.sh \ No newline at end of file diff --git a/podman-matrix/80_destroy.sh b/podman-matrix/80_destroy.sh new file mode 100755 index 0000000..b452ac2 --- /dev/null +++ b/podman-matrix/80_destroy.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +ABSDIR="$( dirname "$(readlink -f -- "$0")" )" +source ${ABSDIR}/../functions.sh +source ${ABSDIR}/vars.sh + +# Run regular prune script for pods +source ${ABSDIR}/../_podman-common/80_destroy_pod.sh && +# Remove pod network +podman network rm ${project_name}_default