From 097d29d8f57c405b4a1134adbcc812b6a9494eef Mon Sep 17 00:00:00 2001
From: Dan Caseley <dan@caseley.me.uk>
Date: Fri, 11 Mar 2022 23:13:35 +0000
Subject: [PATCH] Update scripts. More reliable stop, and mitigate #18

---
 cluster/start.sh                 | 6 ++++--
 cluster_with_federation/start.sh | 6 ++++--
 federation/start.sh              | 6 ++++--
 stop.sh                          | 9 +--------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/cluster/start.sh b/cluster/start.sh
index 04cb649..ead0d66 100755
--- a/cluster/start.sh
+++ b/cluster/start.sh
@@ -33,10 +33,12 @@ echo "Starting a clustered environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-clustered.yml")
 
 "${COMPOSE_FILE_COMMAND[@]}" down
-"${COMPOSE_FILE_COMMAND[@]}" pull
+"${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
-rm -rf _data
+if ! rm -rf _data; then 
+  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
diff --git a/cluster_with_federation/start.sh b/cluster_with_federation/start.sh
index 04cb649..ead0d66 100755
--- a/cluster_with_federation/start.sh
+++ b/cluster_with_federation/start.sh
@@ -33,10 +33,12 @@ echo "Starting a clustered environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-clustered.yml")
 
 "${COMPOSE_FILE_COMMAND[@]}" down
-"${COMPOSE_FILE_COMMAND[@]}" pull
+"${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
-rm -rf _data
+if ! rm -rf _data; then 
+  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
diff --git a/federation/start.sh b/federation/start.sh
index 7cf6195..96ab2c8 100755
--- a/federation/start.sh
+++ b/federation/start.sh
@@ -33,10 +33,12 @@ echo "Starting a federated environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-federated.yml")
 
 "${COMPOSE_FILE_COMMAND[@]}" down
-"${COMPOSE_FILE_COMMAND[@]}" pull
+"${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
-rm -rf _data
+if ! rm -rf _data; then 
+  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
diff --git a/stop.sh b/stop.sh
index 0921bd8..7386052 100755
--- a/stop.sh
+++ b/stop.sh
@@ -1,10 +1,3 @@
 #!/bin/bash
 
-# A list of all possible docker compose files that might've been used to start the stack
-
-docker-compose \
- -f docker-compose-clustered.yml \
- -f docker-compose-federated.yml \
- -f docker-compose-otherdomain.yml \
- -f docker-compose-logging.yml \
-down
\ No newline at end of file
+docker-compose -p openfire down
\ No newline at end of file