Update scripts. More reliable stop, and mitigate #18

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/

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/

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/

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
+docker-compose -p openfire down