feat: implement optimized multi-stage Dockerfiles and refine docker-compose volume mounts for improved development performance

Author: VINGROUP\pn.tund2

docker-compose.yml

@@ -23,8 +23,13 @@ services:
     networks:
       - tatoo-network
     volumes:
-      - ./strapi:/opt/app/strapi
-      - /opt/app/strapi/node_modules
+      # Mount only source code directories for hot-reload ✅
+      # node_modules stays inside the container (Linux-compiled)
+      - ./strapi/src:/opt/app/strapi/src
+      - ./strapi/config:/opt/app/strapi/config
+      - ./strapi/public:/opt/app/strapi/public
+      - ./strapi/database:/opt/app/strapi/database
+      - strapi-uploads:/opt/app/strapi/public/uploads
 
   # Next.js Frontend Service
   next-app:
@@ -43,9 +48,14 @@ services:
     networks:
       - tatoo-network
     volumes:
-      - ./next:/app/next
-      - /app/next/node_modules
-      - /app/next/.next
+      # Mount only source code directories for hot-reload ✅
+      # node_modules and .next cache stay inside the container
+      - ./next/app:/app/next/app
+      - ./next/components:/app/next/components
+      - ./next/lib:/app/next/lib
+      - ./next/public:/app/next/public
+      - ./next/context:/app/next/context
+      - ./next/types:/app/next/types
 
   # PostgreSQL Database Service
   strapi-db:
@@ -89,6 +99,8 @@ services:
 volumes:
   strapi-db-data:
     driver: local
+  strapi-uploads:
+    driver: local
 
 networks:
   tatoo-network:

next/Dockerfile

@@ -14,8 +14,8 @@ RUN apk add --no-cache --virtual .build-deps \
   g++ \
   libc6-compat
 
-# Install pnpm globally
-RUN npm install -g pnpm@10
+# Install pnpm globally in builder
+RUN npm install -g pnpm@10 --no-update-notifier
 
 WORKDIR /build
 
@@ -43,16 +43,16 @@ RUN apk add --no-cache \
   curl \
   libc6-compat
 
-# Enable corepack to provide pnpm in runtime ✅
-RUN corepack enable && corepack prepare pnpm@10.0.0 --activate
+# Install pnpm in runtime stage via npm (most reliable method) ✅
+RUN npm install -g pnpm@10 --no-update-notifier
 
 # Create non-root user ✅
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S nodejs -u 1001
 
 WORKDIR /app
 
-# Copy build artifacts from builder ✅
+# Copy entire build workspace (node_modules at root level for pnpm workspace) ✅
 COPY --from=builder --chown=nodejs:nodejs /build .
 
 # Ensure proper permissions ✅
@@ -67,5 +67,5 @@ EXPOSE 3000
 HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
   CMD curl -f http://localhost:3000 || exit 1
 
-# Start Next.js dev server
+# Start Next.js dev server from workspace root so pnpm resolves correctly
 CMD ["pnpm", "-C", "next", "dev"]

strapi/Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache --virtual .build-deps \
   nasm \
   vips-dev
 
-# Install pnpm globally
+# Install pnpm globally in builder
 RUN npm install -g pnpm@10
 
 WORKDIR /build
@@ -29,8 +29,10 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY strapi/package.json ./strapi/
 COPY next/package.json ./next/
 
+# Copy scripts folder BEFORE install as strapi postinstall depends on it ✅
+COPY strapi/scripts ./strapi/scripts
+
 # Step 2: Install dependencies with frozen lockfile (consistency) ✅
-# Note: Postinstall scripts may fail in Docker, this is handled gracefully
 RUN pnpm install --frozen-lockfile
 
 # Step 3: Copy remaining source code
@@ -51,33 +53,33 @@ RUN apk add --no-cache \
   bash \
   vips
 
-# Enable corepack to provide pnpm in runtime ✅
-RUN corepack enable && corepack prepare pnpm@10.0.0 --activate
+# Install pnpm in runtime stage via npm (most reliable method) ✅
+RUN npm install -g pnpm@10 --no-update-notifier
 
 # Create non-root user for security ✅
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S nodejs -u 1001
 
 WORKDIR /opt/app
 
-# Copy from builder stage - node_modules already compiled ✅
+# Copy entire build workspace (node_modules at root level for pnpm workspace) ✅
 COPY --from=builder --chown=nodejs:nodejs /build .
 
-# Set working directory to strapi
-WORKDIR /opt/app/strapi
-
 # Ensure proper permissions ✅
 RUN chown -R nodejs:nodejs /opt/app
 
 # Switch to non-root user ✅
 USER nodejs
 
+# Set working directory to strapi for CMD
+WORKDIR /opt/app/strapi
+
 # Expose port
 EXPOSE 1337
 
 # Health check ✅
-HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-  CMD curl -f http://localhost:1337/admin || exit 1
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=5 \
+  CMD curl -f http://localhost:1337/_health || exit 1
 
-# Start Strapi
+# Start Strapi (runs in /opt/app/strapi, resolves node_modules from /opt/app/node_modules via workspace)
 CMD ["pnpm", "develop"]

test.Dockerfile

@@ -0,0 +1,5 @@
+FROM node:22-alpine
+RUN corepack enable && corepack prepare pnpm@10.0.0 --activate
+RUN addgroup -g 1001 -S nodejs && adduser -S nodejs -u 1001
+USER nodejs
+RUN command -v pnpm