diff --git a/keep-notes/DOCKER_DEPLOYMENT.md b/keep-notes/DOCKER_DEPLOYMENT.md index fb87743..546bbda 100644 --- a/keep-notes/DOCKER_DEPLOYMENT.md +++ b/keep-notes/DOCKER_DEPLOYMENT.md @@ -43,13 +43,13 @@ EOF ```bash # Build the Docker image -docker-compose build +docker compose build # Start the application -docker-compose up -d +docker compose up -d # View logs -docker-compose logs -f keep-notes +docker compose logs -f keep-notes ``` ### 3. Access the Application @@ -107,8 +107,8 @@ environment: #### 3. Restart Container ```bash -docker-compose down -docker-compose up -d +docker compose down +docker compose up -d ``` ### With SSL/HTTPS (Let's Encrypt) @@ -133,7 +133,7 @@ echo "0 0,12 * * * root certbot renew --quiet" | tee /etc/cron.d/certbot-renew ```bash OPENAI_API_KEY=sk-your-key-here ``` -3. Restart: `docker-compose restart` +3. Restart: `docker compose restart` ### Option 2: Ollama (Local AI) @@ -173,8 +173,8 @@ keep-notes: #### 3. Start and Pull Model ```bash -docker-compose up -d -docker-compose exec -it ollama ollama pull granite4 +docker compose up -d +docker compose exec -it ollama ollama pull granite4 ``` ### Option 3: Custom OpenAI-compatible API @@ -244,14 +244,14 @@ crontab -e ```bash # Stop container -docker-compose down +docker compose down # Restore database cp /path/to/backups/keep-notes_YYYYMMDD_HHMMSS.db \ keep-notes/prisma/dev.db # Start container -docker-compose up -d +docker compose up -d ``` ## ๐Ÿ”„ Updating the Application @@ -261,11 +261,11 @@ docker-compose up -d git pull # Rebuild image -docker-compose build +docker compose build # Restart with new image -docker-compose down -docker-compose up -d +docker compose down +docker compose up -d # Clean up old images docker image prune -a -f @@ -277,28 +277,28 @@ docker image prune -a -f ```bash # Check logs -docker-compose logs keep-notes +docker compose logs keep-notes # Check container status -docker-compose ps +docker compose ps # Enter container for debugging -docker-compose exec keep-notes sh +docker compose exec keep-notes sh ``` ### Database Errors ```bash # Fix database permissions -docker-compose exec keep-notes \ +docker compose exec keep-notes \ chown -R nextjs:nodejs /app/prisma # Regenerate Prisma client -docker-compose exec keep-notes \ +docker compose exec keep-notes \ npx prisma generate # Run migrations -docker-compose exec keep-notes \ +docker compose exec keep-notes \ npx prisma migrate deploy ``` @@ -306,14 +306,14 @@ docker-compose exec keep-notes \ ```bash # Check Ollama status -docker-compose logs ollama +docker compose logs ollama # Test Ollama connection -docker-compose exec keep-notes \ +docker compose exec keep-notes \ curl http://ollama:11434/api/tags # Check environment variables -docker-compose exec keep-notes env | grep -E "OLLAMA|OPENAI" +docker compose exec keep-notes env | grep -E "OLLAMA|OPENAI" ``` ### Performance Issues diff --git a/keep-notes/Dockerfile b/keep-notes/Dockerfile index dd74744..6f5ee80 100644 --- a/keep-notes/Dockerfile +++ b/keep-notes/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app # Install dependencies based on the preferred package manager COPY package.json package-lock.json* ./ -RUN npm ci --legacy-peer-deps +RUN npm ci # Rebuild the source code only when needed FROM base AS builder diff --git a/keep-notes/deploy.sh b/keep-notes/deploy.sh index a7b8e50..7b68c45 100644 --- a/keep-notes/deploy.sh +++ b/keep-notes/deploy.sh @@ -22,7 +22,8 @@ if ! command -v docker &> /dev/null; then exit 1 fi -if ! command -v docker-compose &> /dev/null; then +# Check if docker compose is available (modern Docker Compose v2) +if ! docker compose version &> /dev/null; then echo -e "${RED}โŒ Docker Compose is not installed${NC}" echo "Please install Docker Compose first" exit 1 @@ -64,13 +65,13 @@ COMMAND=${1:-"help"} case $COMMAND in build) echo "๐Ÿ”จ Building Docker image..." - docker-compose build + docker compose build echo -e "${GREEN}โœ“ Build completed${NC}" ;; start|up) echo "๐Ÿš€ Starting containers..." - docker-compose up -d + docker compose up -d echo -e "${GREEN}โœ“ Containers started${NC}" echo "" echo "๐Ÿ“ Application available at: http://localhost:3000" @@ -78,24 +79,24 @@ case $COMMAND in stop|down) echo "โน๏ธ Stopping containers..." - docker-compose down + docker compose down echo -e "${GREEN}โœ“ Containers stopped${NC}" ;; restart) echo "๐Ÿ”„ Restarting containers..." - docker-compose restart + docker compose restart echo -e "${GREEN}โœ“ Containers restarted${NC}" ;; logs) echo "๐Ÿ“‹ Showing logs (Ctrl+C to exit)..." - docker-compose logs -f keep-notes + docker compose logs -f keep-notes ;; status) echo "๐Ÿ“Š Container status:" - docker-compose ps + docker compose ps ;; update) @@ -103,10 +104,10 @@ case $COMMAND in echo "Pulling latest changes..." git pull echo "Rebuilding..." - docker-compose build + docker compose build echo "Restarting..." - docker-compose down - docker-compose up -d + docker compose down + docker compose up -d echo -e "${GREEN}โœ“ Update completed${NC}" ;; @@ -131,7 +132,7 @@ case $COMMAND in clean) echo "๐Ÿงน Cleaning up..." echo "Stopping containers..." - docker-compose down + docker compose down echo "Removing old images..." docker image prune -a -f echo "Removing unused volumes..." @@ -142,13 +143,13 @@ case $COMMAND in ollama-pull) MODEL=${2:-"granite4"} echo "๐Ÿค– Pulling Ollama model: $MODEL" - docker-compose exec -it ollama ollama pull $MODEL + docker compose exec -it ollama ollama pull $MODEL echo -e "${GREEN}โœ“ Model pulled${NC}" ;; shell) echo "๐Ÿš Opening shell in container..." - docker-compose exec keep-notes sh + docker compose exec keep-notes sh ;; *) diff --git a/keep-notes/package.json b/keep-notes/package.json index 8c119f1..82ae780 100644 --- a/keep-notes/package.json +++ b/keep-notes/package.json @@ -48,7 +48,6 @@ "next": "16.1.1", "next-auth": "^5.0.0-beta.30", "nodemailer": "^7.0.12", - "ollama-ai-provider": "^1.2.0", "postcss": "^8.5.6", "react": "19.2.3", "react-dom": "19.2.3",