Merge branch 'dev' into feature/add-docker-build

.dockerignore

@@ -1,6 +0,0 @@
-node_modules
-.git
-.next
-dist
-*.log
-.env.local

Dockerfile

@@ -3,19 +3,10 @@ FROM node:20-alpine AS deps
 WORKDIR /app
 RUN npm install -g pnpm@9.0.0
 
-# Copy all package.json files for proper dependency resolution
+# Copy dependency files first for better caching
-COPY package.json pnpm-lock.yaml turbo.json pnpm-workspace.yaml ./
+COPY package.json pnpm-lock.yaml turbo.json ./
 COPY apps/web/package.json ./apps/web/
-COPY apps/pocketbase/package.json ./apps/pocketbase/
+# Add other app package.json files as needed
-COPY packages/*/package.json ./packages/
-
-# Create the directory structure that might be missing
-RUN mkdir -p packages/ui packages/eslint-config packages/typescript-config
-
-# Copy package.json files to their correct locations
-COPY packages/ui/package.json ./packages/ui/
-COPY packages/eslint-config/package.json ./packages/eslint-config/
-COPY packages/typescript-config/package.json ./packages/typescript-config/
 
 RUN pnpm install --frozen-lockfile
 
@@ -24,47 +15,39 @@ FROM node:20-alpine AS builder
 WORKDIR /app
 RUN npm install -g pnpm@9.0.0
 
-# Copy dependencies and source
+# Copy dependencies from previous stage
 COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/pnpm-lock.yaml ./
+COPY --from=deps /app/package.json /app/pnpm-lock.yaml /app/turbo.json ./
+
+# Copy source code
 COPY . .
 
-# Build only the web app
+# Build the application
-RUN pnpm turbo build --filter=web
+RUN pnpm build
 
 # Stage 3: Runtime
 FROM node:20-alpine AS runtime
 WORKDIR /app
 
+# Install pnpm for production
 RUN npm install -g pnpm@9.0.0
 
-# Copy package files for production install
+# Copy package files
 COPY package.json pnpm-lock.yaml turbo.json ./
 COPY apps/web/package.json ./apps/web/
-COPY packages/*/package.json ./packages/
 
 # Install only production dependencies
 RUN pnpm install --prod --frozen-lockfile
 
-# Copy built Next.js application
+# Copy built application from builder
-COPY --from=builder /app/apps/web/.next ./apps/web/.next
+COPY --from=builder /app/apps/web/dist ./apps/web/dist
-COPY --from=builder /app/apps/web/public ./apps/web/public
+COPY --from=builder /app/apps/web/server.js ./apps/web/
-COPY --from=builder /app/apps/web/next.config.js ./apps/web/
+# Copy other necessary runtime files
-COPY --from=builder /app/apps/web/package.json ./apps/web/
 
-# Copy other necessary files
+# Create non-root user for security
-COPY --from=builder /app/apps/web/lib ./apps/web/lib
-COPY --from=builder /app/apps/web/messages ./apps/web/messages
-
-# Create non-root user
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S nextjs -u 1001
-
-# Change ownership of the app directory
-RUN chown -R nextjs:nodejs /app
 USER nextjs
 
 EXPOSE 3000
-
+CMD ["node", "apps/web/server.js"]
-# Use Next.js start command
-CMD ["pnpm", "--filter=web", "start"]