sync: installAll wave startup/monitoring, cleanAll image-keep option, nginx/iam fixes

README.md

@@ -243,6 +243,11 @@ cd mc-admin-cli/bin
 
 > **When to run cleanAll.sh**: Always run a full clean before switching deployment modes (dev ↔ prod) or changing the domain. Re-running `installAll.sh` over an existing setup without cleaning first can leave stale certificates, nginx config, or DB state that conflicts with the new configuration.
 
+If you only need to reset containers/volumes but want to avoid re-pulling every image on the next `installAll.sh` run (e.g. to stay under a Docker Hub pull quota), use `--keep-current-images`. This still deletes containers/volumes/networks as usual, keeps the image versions currently pinned in `conf/docker/docker-compose.yaml`, and only removes older versions of those same images:
+```shell
+./cleanAll.sh --keep-current-images
+```
+
 ---
 
 ## Known Issues

bin/cleanAll.sh

@@ -1,26 +1,95 @@
 #!/bin/bash
 
+COMPOSE_FILE="../conf/docker/docker-compose.yaml"
+KEEP_CURRENT_IMAGES=false
+
+for arg in "$@"; do
+  case "$arg" in
+    --keep-current-images)
+      KEEP_CURRENT_IMAGES=true
+      ;;
+    -h|--help)
+      echo "Usage: $0 [--keep-current-images]"
+      echo "  --keep-current-images  Keep images pinned in $COMPOSE_FILE (only remove older"
+      echo "                         versions of the same repositories). Avoids re-pulling"
+      echo "                         on the next installAll.sh run and Docker Hub pull quota hits."
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $arg (use -h for usage)"
+      exit 1
+      ;;
+  esac
+done
+
 # Warning message and user confirmation
-cat <<EOF
+if [ "$KEEP_CURRENT_IMAGES" = true ]; then
+  cat <<EOF
+[WARNING]
+This shell script will delete containers, volumes, networks, and all container-volume
+directories used for persistent data. Docker images pinned in $COMPOSE_FILE
+will be KEPT (older versions of the same repositories are still removed) since
+--keep-current-images was given.
+Are you sure you want to continue? (y/n)
+EOF
+else
+  cat <<EOF
 [WARNING]
 This shell script will delete ALL Docker images, containers, volumes, networks, and also remove all container-volume directories used for persistent data.
 This is intended to reset your environment to a clean state.
 Are you sure you want to continue? (y/n)
 EOF
+fi
 read -r answer
 if [[ ! "$answer" =~ ^[Yy]$ ]]; then
   echo "Aborted by user."
   exit 1
 fi
 
-# Delete all Docker images
-echo "All Docker images deleting..."
-if [ -n "$(docker images -q)" ]; then
-  echo "docker rmi \$(docker images -q) -f"
-  docker rmi $(docker images -q) -f
+# Delete Docker images
+if [ "$KEEP_CURRENT_IMAGES" = true ]; then
+  echo "Selective image cleanup (--keep-current-images)..."
+  if [ -f "$COMPOSE_FILE" ]; then
+    mapfile -t current_images < <(grep -E '^[[:space:]]*image:[[:space:]]*\S+' "$COMPOSE_FILE" | sed -E 's/^[[:space:]]*image:[[:space:]]*//' | sort -u)
+
+    declare -A keep_exact=()
+    declare -A keep_repo=()
+    for img in "${current_images[@]}"; do
+      keep_exact["$img"]=1
+      keep_repo["${img%:*}"]=1
+    done
+
+    images_to_remove=()
+    while IFS= read -r local_img; do
+      [ -z "$local_img" ] && continue
+      repo="${local_img%:*}"
+      if [ -n "${keep_repo[$repo]:-}" ] && [ -z "${keep_exact[$local_img]:-}" ]; then
+        images_to_remove+=("$local_img")
+      fi
+    done < <(docker images --format '{{.Repository}}:{{.Tag}}' | grep -v '<none>')
+
+    if [ ${#images_to_remove[@]} -gt 0 ]; then
+      echo "Removing outdated versions of images pinned in $COMPOSE_FILE:"
+      printf "  %s\n" "${images_to_remove[@]}"
+      docker rmi "${images_to_remove[@]}" -f
+    else
+      echo "No outdated versions found for images pinned in $COMPOSE_FILE."
+    fi
+
+    echo "docker image prune -f"
+    docker image prune -f
+  else
+    echo "Warning: $COMPOSE_FILE not found. Skipping selective image cleanup (no images removed)."
+  fi
 else
-  echo "The docker image to delete does not exist."
-  echo "All docker images have already been deleted."
+  echo "All Docker images deleting..."
+  if [ -n "$(docker images -q)" ]; then
+    echo "docker rmi \$(docker images -q) -f"
+    docker rmi $(docker images -q) -f
+  else
+    echo "The docker image to delete does not exist."
+    echo "All docker images have already been deleted."
+  fi
 fi
 
 echo
@@ -36,10 +105,17 @@ else
 fi
 
 echo
-# Clean up all unused Docker system resources (images, containers, networks, build cache)
-echo "Cleaning up all unused Docker system resources (images, containers, networks, build cache)..."
-echo "docker system prune -a -f"
-docker system prune -a -f
+# Clean up all unused Docker system resources (containers, networks, build cache,
+# and -- unless --keep-current-images was given -- all unused images too)
+if [ "$KEEP_CURRENT_IMAGES" = true ]; then
+  echo "Cleaning up unused Docker system resources (containers, networks, build cache)..."
+  echo "docker system prune -f"
+  docker system prune -f
+else
+  echo "Cleaning up all unused Docker system resources (images, containers, networks, build cache)..."
+  echo "docker system prune -a -f"
+  docker system prune -a -f
+fi
 
 echo
 # Delete all volumes