diff --git a/deploy.sh b/deploy.sh index de69332..c7c85a9 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,6 +7,20 @@ set -e echo "🚀 Deploying Capsule to ZimaOS..." echo "" +# Detect docker compose command +if command -v docker-compose &> /dev/null; then + DOCKER_COMPOSE="docker-compose" +elif docker compose version &> /dev/null 2>&1; then + DOCKER_COMPOSE="docker compose" +else + echo "❌ Docker Compose not found" + echo "Please install Docker Compose: https://docs.docker.com/compose/install/" + exit 1 +fi + +echo "✅ Using: $DOCKER_COMPOSE" +echo "" + # Check if .env file exists if [ ! -f .env ]; then echo "⚠️ .env file not found!" @@ -50,11 +64,11 @@ echo "" # Build and start containers echo "🔨 Building Docker image..." -docker-compose build +$DOCKER_COMPOSE build echo "" echo "🚀 Starting Capsule..." -docker-compose up -d +$DOCKER_COMPOSE up -d echo "" echo "⏳ Waiting for container to start..." @@ -63,7 +77,7 @@ sleep 5 # Verify data directory is mounted echo "" echo "🔍 Verifying data persistence..." -if docker-compose exec capsule ls -la /app/data >/dev/null 2>&1; then +if $DOCKER_COMPOSE exec capsule ls -la /app/data >/dev/null 2>&1; then echo "✅ Data directory is correctly mounted in container" else echo "⚠️ Warning: Could not verify data directory mount" @@ -77,10 +91,10 @@ echo " http://localhost:7654" echo " http://$(hostname -I | awk '{print $1}'):7654" echo "" echo "🔧 Useful commands:" -echo " docker-compose logs -f # View logs" -echo " docker-compose stop # Stop container" -echo " docker-compose restart # Restart container" -echo " docker-compose down # Stop and remove container" +echo " $DOCKER_COMPOSE logs -f # View logs" +echo " $DOCKER_COMPOSE stop # Stop container" +echo " $DOCKER_COMPOSE restart # Restart container" +echo " $DOCKER_COMPOSE down # Stop and remove container" echo "" echo "💾 Your data is stored in: ./data/" echo " - This directory persists across container restarts" diff --git a/install.sh b/install.sh index 504a259..e918589 100755 --- a/install.sh +++ b/install.sh @@ -26,12 +26,17 @@ fi echo "✅ Docker found" # Check for Docker Compose -if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then +if command -v docker-compose &> /dev/null; then + DOCKER_COMPOSE="docker-compose" + echo "✅ Docker Compose found (standalone)" +elif docker compose version &> /dev/null 2>&1; then + DOCKER_COMPOSE="docker compose" + echo "✅ Docker Compose found (plugin)" +else echo "❌ Docker Compose is not installed" echo "Please install Docker Compose: https://docs.docker.com/compose/install/" exit 1 fi -echo "✅ Docker Compose found" # Check if git is available if command -v git &> /dev/null; then @@ -126,18 +131,18 @@ echo "✅ Data directory created" # Build and start echo "" echo "🔨 Building Docker image..." -docker-compose build +$DOCKER_COMPOSE build echo "" echo "🚀 Starting Capsule Budget..." -docker-compose up -d +$DOCKER_COMPOSE up -d # Wait for container echo "⏳ Waiting for container to start..." sleep 5 # Verify container is running -if docker-compose ps | grep -q "Up"; then +if $DOCKER_COMPOSE ps | grep -q "Up"; then echo "" echo "╔════════════════════════════════════════════════════════════╗" echo "║ ║" @@ -158,10 +163,10 @@ if docker-compose ps | grep -q "Up"; then echo "💾 Data storage: $(pwd)/data" echo "" echo "🔧 Useful commands (run from $(pwd)):" - echo " docker-compose logs -f # View logs" - echo " docker-compose stop # Stop Capsule" - echo " docker-compose restart # Restart Capsule" - echo " docker-compose down # Stop and remove" + echo " $DOCKER_COMPOSE logs -f # View logs" + echo " $DOCKER_COMPOSE stop # Stop Capsule" + echo " $DOCKER_COMPOSE restart # Restart Capsule" + echo " $DOCKER_COMPOSE down # Stop and remove" echo "" echo "📚 Documentation:" echo " • README.md - Getting started guide" @@ -174,7 +179,7 @@ else echo "❌ Container failed to start" echo "" echo "Troubleshooting:" - echo "1. Check logs: docker-compose logs" + echo "1. Check logs: $DOCKER_COMPOSE logs" echo "2. Verify .env file has ENCRYPTION_KEY set" echo "3. Check if port 7654 is available" echo ""