From 92b4a5f02797d47a0315a0fb770bf146295e4ea7 Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Tue, 6 Jan 2026 14:14:47 +0800
Subject: [PATCH] Fix bucket setup to load credentials from .env

---
 setup-buckets.sh | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/setup-buckets.sh b/setup-buckets.sh
index e5b47e0..7ab242b 100644
--- a/setup-buckets.sh
+++ b/setup-buckets.sh
@@ -5,15 +5,42 @@ set -e
 
 MINIO_ALIAS="crewminio"
 MINIO_ENDPOINT="http://crew-minio-prod:9000"
-MINIO_USER="${MINIO_ROOT_USER:-minioadmin}"
-MINIO_PASSWORD="${MINIO_ROOT_PASSWORD:-minioadmin123}"
 CONTAINER_NAME="crew-minio-prod"
+DEPLOY_DIR="/var/www/apps/minio-storage"
 
 echo "=========================================="
 echo "Setting up MinIO buckets for Crew apps"
 echo "=========================================="
 echo ""
 
+# Load credentials from .env file
+echo "🔑 Loading MinIO credentials from .env"
+if [ -f "$DEPLOY_DIR/.env" ]; then
+  set -a
+  source "$DEPLOY_DIR/.env"
+  set +a
+  MINIO_USER="${MINIO_ROOT_USER}"
+  MINIO_PASSWORD="${MINIO_ROOT_PASSWORD}"
+elif [ -f ".env" ]; then
+  set -a
+  source ".env"
+  set +a
+  MINIO_USER="${MINIO_ROOT_USER}"
+  MINIO_PASSWORD="${MINIO_ROOT_PASSWORD}"
+else
+  echo "⚠️  .env file not found, using defaults"
+  MINIO_USER="minioadmin"
+  MINIO_PASSWORD="minioadmin123"
+fi
+
+if [ -z "$MINIO_USER" ] || [ -z "$MINIO_PASSWORD" ]; then
+  echo "❌ MINIO_ROOT_USER or MINIO_ROOT_PASSWORD not set in .env"
+  exit 1
+fi
+
+echo "✓ Credentials loaded (User: $MINIO_USER)"
+echo ""
+
 # Check if MinIO is running
 if ! docker ps | grep -q "$CONTAINER_NAME"; then
     echo "❌ Error: $CONTAINER_NAME container is not running"
@@ -35,8 +62,8 @@ echo "✓ MinIO Client installed"
 echo ""
 
 # Configure MinIO client
-echo "Configuring MinIO client..."
-docker exec $CONTAINER_NAME mc alias set $MINIO_ALIAS $MINIO_ENDPOINT $MINIO_USER $MINIO_PASSWORD
+echo "⚙️  Configuring MinIO client"
+docker exec $CONTAINER_NAME mc alias set $MINIO_ALIAS $MINIO_ENDPOINT "$MINIO_USER" "$MINIO_PASSWORD"
 echo ""
 
 # Create buckets for each application