chore(docker): tweak deployment docs and scripts; update package metadata
This commit is contained in:
parent
3854a3e302
commit
1678bcaced
@ -43,13 +43,13 @@ EOF
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Build the Docker image
|
# Build the Docker image
|
||||||
docker-compose build
|
docker compose build
|
||||||
|
|
||||||
# Start the application
|
# Start the application
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
# View logs
|
# View logs
|
||||||
docker-compose logs -f keep-notes
|
docker compose logs -f keep-notes
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3. Access the Application
|
### 3. Access the Application
|
||||||
@ -107,8 +107,8 @@ environment:
|
|||||||
#### 3. Restart Container
|
#### 3. Restart Container
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker-compose down
|
docker compose down
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
### With SSL/HTTPS (Let's Encrypt)
|
### 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
|
```bash
|
||||||
OPENAI_API_KEY=sk-your-key-here
|
OPENAI_API_KEY=sk-your-key-here
|
||||||
```
|
```
|
||||||
3. Restart: `docker-compose restart`
|
3. Restart: `docker compose restart`
|
||||||
|
|
||||||
### Option 2: Ollama (Local AI)
|
### Option 2: Ollama (Local AI)
|
||||||
|
|
||||||
@ -173,8 +173,8 @@ keep-notes:
|
|||||||
#### 3. Start and Pull Model
|
#### 3. Start and Pull Model
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
docker-compose exec -it ollama ollama pull granite4
|
docker compose exec -it ollama ollama pull granite4
|
||||||
```
|
```
|
||||||
|
|
||||||
### Option 3: Custom OpenAI-compatible API
|
### Option 3: Custom OpenAI-compatible API
|
||||||
@ -244,14 +244,14 @@ crontab -e
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Stop container
|
# Stop container
|
||||||
docker-compose down
|
docker compose down
|
||||||
|
|
||||||
# Restore database
|
# Restore database
|
||||||
cp /path/to/backups/keep-notes_YYYYMMDD_HHMMSS.db \
|
cp /path/to/backups/keep-notes_YYYYMMDD_HHMMSS.db \
|
||||||
keep-notes/prisma/dev.db
|
keep-notes/prisma/dev.db
|
||||||
|
|
||||||
# Start container
|
# Start container
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
## 🔄 Updating the Application
|
## 🔄 Updating the Application
|
||||||
@ -261,11 +261,11 @@ docker-compose up -d
|
|||||||
git pull
|
git pull
|
||||||
|
|
||||||
# Rebuild image
|
# Rebuild image
|
||||||
docker-compose build
|
docker compose build
|
||||||
|
|
||||||
# Restart with new image
|
# Restart with new image
|
||||||
docker-compose down
|
docker compose down
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
# Clean up old images
|
# Clean up old images
|
||||||
docker image prune -a -f
|
docker image prune -a -f
|
||||||
@ -277,28 +277,28 @@ docker image prune -a -f
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check logs
|
# Check logs
|
||||||
docker-compose logs keep-notes
|
docker compose logs keep-notes
|
||||||
|
|
||||||
# Check container status
|
# Check container status
|
||||||
docker-compose ps
|
docker compose ps
|
||||||
|
|
||||||
# Enter container for debugging
|
# Enter container for debugging
|
||||||
docker-compose exec keep-notes sh
|
docker compose exec keep-notes sh
|
||||||
```
|
```
|
||||||
|
|
||||||
### Database Errors
|
### Database Errors
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Fix database permissions
|
# Fix database permissions
|
||||||
docker-compose exec keep-notes \
|
docker compose exec keep-notes \
|
||||||
chown -R nextjs:nodejs /app/prisma
|
chown -R nextjs:nodejs /app/prisma
|
||||||
|
|
||||||
# Regenerate Prisma client
|
# Regenerate Prisma client
|
||||||
docker-compose exec keep-notes \
|
docker compose exec keep-notes \
|
||||||
npx prisma generate
|
npx prisma generate
|
||||||
|
|
||||||
# Run migrations
|
# Run migrations
|
||||||
docker-compose exec keep-notes \
|
docker compose exec keep-notes \
|
||||||
npx prisma migrate deploy
|
npx prisma migrate deploy
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -306,14 +306,14 @@ docker-compose exec keep-notes \
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check Ollama status
|
# Check Ollama status
|
||||||
docker-compose logs ollama
|
docker compose logs ollama
|
||||||
|
|
||||||
# Test Ollama connection
|
# Test Ollama connection
|
||||||
docker-compose exec keep-notes \
|
docker compose exec keep-notes \
|
||||||
curl http://ollama:11434/api/tags
|
curl http://ollama:11434/api/tags
|
||||||
|
|
||||||
# Check environment variables
|
# 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
|
### Performance Issues
|
||||||
|
|||||||
@ -8,7 +8,7 @@ WORKDIR /app
|
|||||||
|
|
||||||
# Install dependencies based on the preferred package manager
|
# Install dependencies based on the preferred package manager
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
RUN npm ci --legacy-peer-deps
|
RUN npm ci
|
||||||
|
|
||||||
# Rebuild the source code only when needed
|
# Rebuild the source code only when needed
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
|
|||||||
@ -22,7 +22,8 @@ if ! command -v docker &> /dev/null; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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 -e "${RED}❌ Docker Compose is not installed${NC}"
|
||||||
echo "Please install Docker Compose first"
|
echo "Please install Docker Compose first"
|
||||||
exit 1
|
exit 1
|
||||||
@ -64,13 +65,13 @@ COMMAND=${1:-"help"}
|
|||||||
case $COMMAND in
|
case $COMMAND in
|
||||||
build)
|
build)
|
||||||
echo "🔨 Building Docker image..."
|
echo "🔨 Building Docker image..."
|
||||||
docker-compose build
|
docker compose build
|
||||||
echo -e "${GREEN}✓ Build completed${NC}"
|
echo -e "${GREEN}✓ Build completed${NC}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
start|up)
|
start|up)
|
||||||
echo "🚀 Starting containers..."
|
echo "🚀 Starting containers..."
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
echo -e "${GREEN}✓ Containers started${NC}"
|
echo -e "${GREEN}✓ Containers started${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "📝 Application available at: http://localhost:3000"
|
echo "📝 Application available at: http://localhost:3000"
|
||||||
@ -78,24 +79,24 @@ case $COMMAND in
|
|||||||
|
|
||||||
stop|down)
|
stop|down)
|
||||||
echo "⏹️ Stopping containers..."
|
echo "⏹️ Stopping containers..."
|
||||||
docker-compose down
|
docker compose down
|
||||||
echo -e "${GREEN}✓ Containers stopped${NC}"
|
echo -e "${GREEN}✓ Containers stopped${NC}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
restart)
|
restart)
|
||||||
echo "🔄 Restarting containers..."
|
echo "🔄 Restarting containers..."
|
||||||
docker-compose restart
|
docker compose restart
|
||||||
echo -e "${GREEN}✓ Containers restarted${NC}"
|
echo -e "${GREEN}✓ Containers restarted${NC}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
logs)
|
logs)
|
||||||
echo "📋 Showing logs (Ctrl+C to exit)..."
|
echo "📋 Showing logs (Ctrl+C to exit)..."
|
||||||
docker-compose logs -f keep-notes
|
docker compose logs -f keep-notes
|
||||||
;;
|
;;
|
||||||
|
|
||||||
status)
|
status)
|
||||||
echo "📊 Container status:"
|
echo "📊 Container status:"
|
||||||
docker-compose ps
|
docker compose ps
|
||||||
;;
|
;;
|
||||||
|
|
||||||
update)
|
update)
|
||||||
@ -103,10 +104,10 @@ case $COMMAND in
|
|||||||
echo "Pulling latest changes..."
|
echo "Pulling latest changes..."
|
||||||
git pull
|
git pull
|
||||||
echo "Rebuilding..."
|
echo "Rebuilding..."
|
||||||
docker-compose build
|
docker compose build
|
||||||
echo "Restarting..."
|
echo "Restarting..."
|
||||||
docker-compose down
|
docker compose down
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
echo -e "${GREEN}✓ Update completed${NC}"
|
echo -e "${GREEN}✓ Update completed${NC}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -131,7 +132,7 @@ case $COMMAND in
|
|||||||
clean)
|
clean)
|
||||||
echo "🧹 Cleaning up..."
|
echo "🧹 Cleaning up..."
|
||||||
echo "Stopping containers..."
|
echo "Stopping containers..."
|
||||||
docker-compose down
|
docker compose down
|
||||||
echo "Removing old images..."
|
echo "Removing old images..."
|
||||||
docker image prune -a -f
|
docker image prune -a -f
|
||||||
echo "Removing unused volumes..."
|
echo "Removing unused volumes..."
|
||||||
@ -142,13 +143,13 @@ case $COMMAND in
|
|||||||
ollama-pull)
|
ollama-pull)
|
||||||
MODEL=${2:-"granite4"}
|
MODEL=${2:-"granite4"}
|
||||||
echo "🤖 Pulling Ollama model: $MODEL"
|
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}"
|
echo -e "${GREEN}✓ Model pulled${NC}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shell)
|
shell)
|
||||||
echo "🐚 Opening shell in container..."
|
echo "🐚 Opening shell in container..."
|
||||||
docker-compose exec keep-notes sh
|
docker compose exec keep-notes sh
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|||||||
@ -48,7 +48,6 @@
|
|||||||
"next": "16.1.1",
|
"next": "16.1.1",
|
||||||
"next-auth": "^5.0.0-beta.30",
|
"next-auth": "^5.0.0-beta.30",
|
||||||
"nodemailer": "^7.0.12",
|
"nodemailer": "^7.0.12",
|
||||||
"ollama-ai-provider": "^1.2.0",
|
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user