fix reinstall of fts (#2324)

Signed-off-by: szaimen <[email protected]>

Author: szaimen

apps/fulltextsearch.sh

@@ -51,6 +51,7 @@ else
     docker_prune_this "$nc_fts"
     docker_prune_this "$opens_fts"
     docker_prune_volume "esdata"
+    docker_prune_volume "opensearch_fts_os-data"
     docker_prune_volume "fts_os-data"
     # Remove configuration files
     rm -rf "$RORDIR"
@@ -211,6 +212,7 @@ services:
 
 volumes:
   fts_os-data:
+    name: fts_os-data
 
 networks:
   fts_os-net:

apps/opensearch_certs.sh

@@ -4,6 +4,7 @@
 # Source:
 # https://opensearch.org/docs/latest/security-plugin/configuration/generate-certificates/#sample-script
 
+rm -rf tls_store
 mkdir tls_store
 TLS_DN="/C=CA/ST=NEXTCLOUD/L=VM/O=OPENSEARCH/OU=FTS"
 

lib.sh

@@ -1679,16 +1679,16 @@ then
     msg_box "Removing old Docker image: $1
 You will be given the option to abort when you hit OK."
     any_key "Press any key to continue. Press CTRL+C to abort"
-    docker stop "$(docker container ls | grep "$1" | awk '{print $1}' | tail -1)"
-    docker rm "$(docker container ls | grep "$1" | awk '{print $1}' | tail -1)" --volumes
+    docker stop "$(docker container ls -a | grep "$1" | awk '{print $1}' | tail -1)"
+    docker rm "$(docker container ls -a | grep "$1" | awk '{print $1}' | tail -1)" --volumes
     docker image prune -a -f
 fi
 }
 
 # Remove selected Docker volume
 # docker_prune_volume ''
 docker_prune_volume() {
-if docker volume ls | grep -q "^$1$"
+if docker volume ls | grep -q "$1$"
 then
     msg_box "Removing old Docker volume: $1
 You will be given the option to abort when you hit OK."