From f57f7b2a8c5ca350cbd6d691cbcb53401e2b7eb6 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 26 Sep 2020 16:14:32 +0200
Subject: [PATCH] Better approach: only run cleanup during purge

---
 plugin.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugin.sh b/plugin.sh
index 154d1dc..a2da71c 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -67,14 +67,11 @@ run_stack_wait() {
 run_purge() {
   echo "--- start purge ---"
   docker -H "$DOCKER_HOST" stack rm "$PLUGIN_STACK"
-  echo "--- end purge ---"
-}
 
-run_cleanup() {
-  echo "--- start cleanup ---"
   # See https://github.com/moby/moby/issues/30942#issuecomment-540699206
   until [ -z "$(docker stack ps "$PLUGIN_STACK" -q)" ]; do sleep 1; done
   docker -H "$DOCKER_HOST" system prune --all --volumes --force
+
   # try and remove all secrets; Docker will leave ones which are in use
   docker -H "$DOCKER_HOST" secret ls --format '{{ .Name }}' | xargs -i sh -c "echo {}; docker -H \"$DOCKER_HOST\" secret rm {} || true"
   echo "--- end cleanup ---"
@@ -96,7 +93,6 @@ run_plugin() {
     run_purge
   fi
 
-  run_cleanup
   echo "--- end ssh-stack-deploy ---"
 }