simplified deploy

Author: chapppington

deploy.sh

@@ -7,83 +7,35 @@ APP_DIR=${VPS_APP_DIR:-$(pwd)}
 
 echo "🚀 Starting deployment of branch: $BRANCH"
 
-cd "$APP_DIR" || {
-    echo "❌ Directory $APP_DIR not found!"
-    exit 1
-}
+cd "$APP_DIR" || exit 1
 
 echo "📥 Fetching latest code..."
 git fetch origin
 git reset --hard "origin/$BRANCH"
 git clean -fd
 
-if [ ! -f .env ]; then
-    echo "⚠️  Warning: .env file not found!"
-    echo "Please create .env file before deployment."
-    exit 1
-fi
+[ ! -f .env ] && { echo "❌ .env file not found!"; exit 1; }
 
-echo "🛑 Stopping application container..."
-docker stop main-app 2>/dev/null || true
-docker rm main-app 2>/dev/null || true
-
-echo "🔍 Checking volumes..."
-VOLUMES_EXIST=$(docker volume ls | grep -E "postgres_data|pgadmin_data" | wc -l)
-if [ "$VOLUMES_EXIST" -ge 2 ]; then
-    echo "✅ Volumes exist and will be preserved"
-else
-    echo "⚠️  Warning: Some volumes may not exist yet (will be created on first run)"
-fi
+echo "🛑 Stopping containers..."
+make all-down || true
 
 echo "🔨 Building and starting containers..."
-docker compose -f docker_compose/storages.yaml --env-file .env up -d
-echo "🔨 Building and starting application..."
-docker compose -f docker_compose/storages.yaml -f docker_compose/app.yaml --env-file .env up --build -d main-app
-
-DB_NAME=$(grep -E "^POSTGRES_DB=" .env 2>/dev/null | cut -d '=' -f2 | tr -d '"' | tr -d "'" || echo "organization_catalog")
-DB_USER=$(grep -E "^POSTGRES_USER=" .env 2>/dev/null | cut -d '=' -f2 | tr -d '"' | tr -d "'" || echo "postgres")
+make all
 
-DB_NAME=$(echo "$DB_NAME" | xargs)
-DB_USER=$(echo "$DB_USER" | xargs)
+DB_USER=$(grep "^POSTGRES_USER=" .env | cut -d'=' -f2 | xargs || echo "postgres")
 
-echo "⏳ Waiting for PostgreSQL to be ready..."
-MAX_ATTEMPTS=30
-ATTEMPT=0
-while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
-    if docker exec postgres pg_isready -U "$DB_USER" > /dev/null 2>&1; then
-        echo "✅ PostgreSQL is ready!"
-        break
-    fi
-    ATTEMPT=$((ATTEMPT + 1))
-    echo "   Attempt $ATTEMPT/$MAX_ATTEMPTS..."
+echo "⏳ Waiting for PostgreSQL..."
+for i in {1..30}; do
+    docker exec postgres pg_isready -U "$DB_USER" >/dev/null 2>&1 && break
+    [ $i -eq 30 ] && { echo "❌ PostgreSQL failed to start"; exit 1; }
     sleep 2
 done
+echo "✅ PostgreSQL is ready!"
 
-if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
-    echo "❌ PostgreSQL failed to become ready after $MAX_ATTEMPTS attempts"
-    exit 1
-fi
-
-echo "🔍 Checking if database '$DB_NAME' exists..."
-if ! docker exec postgres psql -U "$DB_USER" -lqt 2>/dev/null | cut -d \| -f 1 | grep -qw "$DB_NAME"; then
-    echo "📦 Creating database '$DB_NAME'..."
-    docker exec postgres psql -U "$DB_USER" -c "CREATE DATABASE $DB_NAME;" 2>/dev/null || {
-        echo "⚠️  Failed to create database, but continuing..."
-    }
-else
-    echo "✅ Database '$DB_NAME' already exists"
-fi
-
-echo "📊 Running database migrations..."
-docker exec main-app alembic upgrade head || {
-    echo "⚠️  Migration failed, but continuing..."
-}
-
-echo "🧹 Cleaning up old Docker images..."
-docker image prune -f
-
-echo "✅ Checking container status..."
-docker ps --filter "name=main-app" --format "table {{.Names}}\t{{.Status}}"
+echo "📊 Running migrations..."
+make migrate || true
 
-echo "🎉 Deployment completed successfully!"
+echo "🧹 Cleaning up..."
+docker image prune -f >/dev/null 2>&1
 
+echo "✅ Deployment completed!"