Feat/connor/local redis

.dockerignore

@@ -1,44 +1,54 @@
 # Version control
+
 .git
 .gitignore
 
 # Dependencies
+
 node_modules
 .next
 
 # Environment files
+
 .env
-.env.*
+.env.\*
 
 # Documentation
+
 README.md
 
 # Docker files
+
 .dockerignore
 Dockerfile
 docker-compose.yml
 
 # Logs
-*.log
+
+\*.log
 
 # Python virtual environment
+
 venv/
-__pycache__/
-*.pyc
-*.pyo
-*.pyd
+**pycache**/
+_.pyc
+_.pyo
+\*.pyd
 
 # OS files
+
 .DS_Store
 Thumbs.db
 
 # Build artifacts
+
 dist/
 build/
-*.tsbuildinfo
+\*.tsbuildinfo
 
 # Development files
+
 .vscode/
 .idea/
-*.swp
-*.swo 
+_.swp
+_.swo

Dockerfile

@@ -17,11 +17,12 @@ RUN apt-get update && \
     apt-get install -y openssl python3 make g++
 
 # Copy package files
-COPY package.json pnpm-lock.yaml* ./
+COPY package.json ./
+COPY pnpm-lock.yaml ./
 COPY prisma ./prisma/
 
-# Install dependencies
-RUN pnpm install
+# Clean install dependencies
+RUN pnpm install --frozen-lockfile
 
 # Development image
 FROM base AS development
@@ -33,10 +34,13 @@ COPY . .
 # Generate Prisma Client for development
 RUN npx prisma generate
 
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 # Expose port
 EXPOSE 3000
 
 # Start development server
+ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["pnpm", "dev"]
 
 # Rebuild the source code only when needed

docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   app:
+    platform: linux/arm64/v8
     build:
       context: .
       target: development
@@ -15,10 +16,9 @@ services:
         - REDIS_URL=redis://redis:6379
     ports:
       - "3000:3000"
-      - "9229:9229" # For debugging
+      - "9229:9229"
     environment:
       - NODE_ENV=development
-      - DATABASE_URL=${DATABASE_URL}
       - NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=${NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY}
       - CLERK_SECRET_KEY=${CLERK_SECRET_KEY}
       - CEREBRAS_API_KEY=${CEREBRAS_API_KEY}
@@ -39,6 +39,7 @@ services:
       - redis
 
   db:
+    platform: linux/arm64/v8
     image: postgres:16
     ports:
       - "5432:5432"
@@ -48,15 +49,44 @@ services:
       - POSTGRES_DB=openbooklm
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   redis:
-    image: redis:7-alpine
+    platform: linux/arm64/v8
+    image: redis:7
     ports:
       - "6379:6379"
     volumes:
       - redis_data:/data
-    command: redis-server --save 60 1 --loglevel warning
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+    command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+  redis-insight:
+    image: redislabs/redisinsight:latest
+    platform: linux/arm64/v8  # For M1/M2 Macs
+    ports:
+      - "8001:8001"
+    depends_on:
+      - redis
+
+
 
 volumes:
   postgres_data:
-  redis_data:
+  redis_data:

docker-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# Wait for database to be ready
+echo "Waiting for database to be ready..."
+npx wait-on tcp:db:5432 -t 60000
+
+# Run migrations
+echo "Running database migrations..."
+npx prisma migrate deploy
+
+# Then run the main container command
+exec "$@"

fly.toml

@@ -0,0 +1,28 @@
+# fly.toml app configuration file generated for openbooklm on 2025-01-20T16:40:22-05:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'openbooklm'
+primary_region = 'dfw'
+
+[build]
+  dockerfile = 'Dockerfile'
+
+[env]
+  HOSTNAME = '0.0.0.0'
+  NODE_ENV = 'production'
+  PORT = '3000'
+
+[http_service]
+  internal_port = 3000
+  force_https = true
+  auto_stop_machines = 'stop'
+  auto_start_machines = true
+  min_machines_running = 1
+  processes = ['app']
+
+[[vm]]
+  cpu_kind = 'shared'
+  cpus = 1
+  memory_mb = 1024

next.config.mjs

@@ -1,6 +1,12 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  output: 'standalone',
-}
+  output: "standalone",
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+};
 
 export default nextConfig;

package.json

@@ -18,17 +18,23 @@
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-slot": "^1.0.2",
-    "ioredis": "^5.3.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
+    "date-fns": "^4.1.0",
+    "fns": "^1.0.0",
+    "googleapis": "^144.0.0",
+    "ioredis": "^5.4.2",
     "lucide-react": "^0.309.0",
-    "next": "14.0.4",
+    "next": "14.1.0",
     "next-auth": "^4.24.11",
     "next-themes": "^0.2.1",
+    "perf_hooks": "^0.0.1",
     "prisma": "^6.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-dropzone": "^14.3.5",
     "react-markdown": "^9.0.3",
+    "sonner": "^1.4.0",
     "tailwind-merge": "^2.2.0",
     "tailwindcss-animate": "^1.0.7"
   },
@@ -41,6 +47,11 @@
     "eslint-config-next": "14.0.4",
     "postcss": "^8.4.33",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3",
+    "wait-on": "^8.0.2"
+  },
+  "prisma": {
+    "seed": "npx ts-node --compiler-options '{\"module\":\"CommonJS\"}' prisma/seed.ts"
   }
 }