Replace ds-container-remove.sh with ds-remove.sh

tests/README.adoc

@@ -13,5 +13,5 @@ $ /usr/share/pki/tests/bin/ds-create.sh \
 To remove a DS container for testing:
 
 ----
-$ /usr/share/pki/tests/bin/ds-container-remove.sh ds
+$ /usr/share/pki/tests/bin/ds-remove.sh ds
 ----

tests/bin/ds-remove.sh

@@ -1,3 +1,110 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
-dsctl slapd-localhost remove --do-it
+# https://fy.blackhats.net.au/blog/html/2020/03/28/389ds_in_containers.html
+
+SCRIPT_PATH=$(readlink -f "$0")
+SCRIPT_NAME=$(basename "$SCRIPT_PATH")
+SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
+
+VERBOSE=
+DEBUG=
+
+usage() {
+    echo "Usage: $SCRIPT_NAME [OPTIONS] <name>"
+    echo
+    echo "Options:"
+    echo "    --image=<image>          Container image (default: quay.io/389ds/dirsrv)"
+    echo " -v,--verbose                Run in verbose mode."
+    echo "    --debug                  Run in debug mode."
+    echo "    --help                   Show help message."
+}
+
+while getopts v-: arg ; do
+    case $arg in
+    v)
+        VERBOSE=true
+        ;;
+    -)
+        LONG_OPTARG="${OPTARG#*=}"
+
+        case $OPTARG in
+        image=?*)
+            IMAGE="$LONG_OPTARG"
+            ;;
+        verbose)
+            VERBOSE=true
+            ;;
+        debug)
+            VERBOSE=true
+            DEBUG=true
+            ;;
+        help)
+            usage
+            exit
+            ;;
+        '')
+            break # "--" terminates argument processing
+            ;;
+        image*)
+            echo "ERROR: Missing argument for --$OPTARG option" >&2
+            exit 1
+            ;;
+        *)
+            echo "ERROR: Illegal option --$OPTARG" >&2
+            exit 1
+            ;;
+        esac
+        ;;
+    \?)
+        exit 1 # getopts already reported the illegal option
+        ;;
+    esac
+done
+
+NAME=$1
+
+if [ "$NAME" == "" ]
+then
+    echo "ERROR: Missing container name"
+    exit 1
+fi
+
+if [ "$IMAGE" = "" ]
+then
+    IMAGE=quay.io/389ds/dirsrv
+fi
+
+remove_server() {
+    echo "Removing DS server"
+
+    docker exec $NAME dsctl slapd-localhost remove --do-it
+
+    echo "Removing DS container"
+
+    docker rm $NAME > /dev/null
+
+    echo "DS server has been removed"
+}
+
+remove_container() {
+    echo "Stopping DS container"
+
+    docker stop $NAME > /dev/null
+
+    echo "Removing DS container"
+
+    docker rm $NAME > /dev/null
+
+    echo "Removing DS volume"
+
+    docker volume rm $NAME-data > /dev/null
+
+    echo "DS container has been removed"
+}
+
+if [ "$IMAGE" = "pki-runner" ]
+then
+    remove_server
+else
+    remove_container
+fi