Merge pull request #198 from gruz0/refactor/optimize-docker-image

Optimize Docker image

.dockerignore

@@ -19,10 +19,10 @@ jest.config.ts
 .prettier*
 .eslint*
 .editorconfig
+knip.json
 LICENSE
 Makefile
 codespell.txt
-architecture
 __tests__
 docker
 

Dockerfile

@@ -1,94 +1,92 @@
 ARG NODE_VERSION="22.11.0"
 ARG ALPINE_VERSION="3.20"
-ARG NPM_SHARP_VERSION="0.33.5"
 
-# Install dependencies only when needed
+#
+# Stage 1: Install dependencies (including devDependencies)
+#
 FROM node:"${NODE_VERSION}"-alpine"${ALPINE_VERSION}" AS base
 
 WORKDIR /app
 
 COPY package.json package-lock.json ./
 
-RUN npm install "sharp@${NPM_SHARP_VERSION}" && npm ci
+# We cannot use --omit=dev here because devDependencies are needed for building
+# So, keep this line like that:
+RUN npm ci && \
+    npm cache clean --force && \
+    find . -name "*.map" -delete
 
-# Rebuild the source code only when needed
+#
+# Stage 2: Build the application
+#
 FROM node:"${NODE_VERSION}"-alpine"${ALPINE_VERSION}" AS builder
 WORKDIR /app
 
 COPY --from=base /app/node_modules ./node_modules
-COPY . .
-
-ENV NODE_ENV production
-
-ENV NEXT_TELEMETRY_DISABLED 1
-
-ARG DOMAIN
-ENV DOMAIN=$DOMAIN
-
-ARG OPENAI_API_KEY
-ENV OPENAI_API_KEY=$OPENAI_API_KEY
-
-ARG REDIS_URL
-ENV REDIS_URL=$REDIS_URL
-
-ARG DATABASE_URL
-ENV DATABASE_URL=$DATABASE_URL
-
-ARG SENTRY_DSN
-ENV SENTRY_DSN=$SENTRY_DSN
-
-ARG NEXT_PUBLIC_URL
-ENV NEXT_PUBLIC_URL=$NEXT_PUBLIC_URL
-
-ARG CREATE_IDEA_LIMITER_LIMIT
-ENV CREATE_IDEA_LIMITER_LIMIT=$CREATE_IDEA_LIMITER_LIMIT
-
-ARG CREATE_IDEA_LIMITER_TIMEFRAME
-ENV CREATE_IDEA_LIMITER_TIMEFRAME=$CREATE_IDEA_LIMITER_TIMEFRAME
 
-ARG IDEA_SERVICE_API_BASE
-ENV IDEA_SERVICE_API_BASE=$IDEA_SERVICE_API_BASE
-
-ARG CONCEPT_SERVICE_API_BASE
-ENV CONCEPT_SERVICE_API_BASE=$CONCEPT_SERVICE_API_BASE
-
-ARG FEEDBACK_SERVICE_API_BASE
-ENV FEEDBACK_SERVICE_API_BASE=$FEEDBACK_SERVICE_API_BASE
-
-RUN npm run build
+COPY . .
 
+# Build-time arguments
+ARG DOMAIN \
+    NEXT_PUBLIC_URL \
+    CREATE_IDEA_LIMITER_LIMIT \
+    CREATE_IDEA_LIMITER_TIMEFRAME \
+    IDEA_SERVICE_API_BASE \
+    CONCEPT_SERVICE_API_BASE \
+    FEEDBACK_SERVICE_API_BASE
+
+# Set environment variables for the build
+ENV NODE_ENV=production \
+    NEXT_TELEMETRY_DISABLED=1 \
+    PRISMA_HIDE_UPDATE_MESSAGE=1 \
+    DOMAIN=$DOMAIN \
+    NEXT_PUBLIC_URL=$NEXT_PUBLIC_URL \
+    CREATE_IDEA_LIMITER_LIMIT=$CREATE_IDEA_LIMITER_LIMIT \
+    CREATE_IDEA_LIMITER_TIMEFRAME=$CREATE_IDEA_LIMITER_TIMEFRAME \
+    IDEA_SERVICE_API_BASE=$IDEA_SERVICE_API_BASE \
+    CONCEPT_SERVICE_API_BASE=$CONCEPT_SERVICE_API_BASE \
+    FEEDBACK_SERVICE_API_BASE=$FEEDBACK_SERVICE_API_BASE
+
+RUN npm run build && \
+    rm -rf .next/cache && \
+    find . -name "*.map" -delete
+
+#
+# Stage 3: Install only production dependencies
+#
 FROM node:"${NODE_VERSION}"-alpine"${ALPINE_VERSION}" AS prod_builder
 WORKDIR /app
 
 ENV NODE_ENV production
 
 COPY --from=base /app/node_modules ./node_modules
-COPY . .
+COPY package.json package-lock.json ./
 
-RUN npm install && cp -R node_modules prod_node_modules
+RUN npm ci --omit=dev && \
+    find . -name "*.map" -delete && \
+    cp -R node_modules prod_node_modules
 
-# Production image, copy all the files and run next
+#
+# Stage 4: Runner - Final image to run the application
+#
 FROM node:"${NODE_VERSION}"-alpine"${ALPINE_VERSION}" AS runner
 
 WORKDIR /app
 
-ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
-
+# Default user ID (must be overridden at build time)
 ARG UID=1001
-ENV USER="app"
+
+ENV NODE_ENV=production \
+    NEXT_TELEMETRY_DISABLED=1 \
+    USER="app"
 
 RUN adduser -D $USER -u $UID
 
-# You only need to copy next.config.mjs if you are NOT using the default configuration
+COPY --from=prod_builder --chown=$USER:$USER /app/prod_node_modules ./node_modules
 COPY --from=builder --chown=$USER:$USER /app/next.config.mjs ./
 COPY --from=builder --chown=$USER:$USER /app/prisma ./prisma
 COPY --from=builder --chown=$USER:$USER /app/public ./public
 COPY --from=builder --chown=$USER:$USER /app/package.json ./package.json
-COPY --from=prod_builder --chown=$USER:$USER /app/prod_node_modules ./node_modules
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/pages/api-reference/next-config-js/output
 COPY --from=builder --chown=$USER:$USER /app/.next/standalone ./
 COPY --from=builder --chown=$USER:$USER /app/.next/static ./.next/static
 

Makefile

@@ -19,9 +19,6 @@ setup: # Install dependencies
 prepare-dev-env:
 	@cp .env.development .env
 
-analyze: prepare-dev-env # Analyze bundles
-	@${NPM_RUN} analyze
-
 build: prepare-dev-env # Build project
 	@${NPM_RUN} build
 

docker-compose.production.yml

@@ -6,10 +6,6 @@ services:
       args:
         - UID=${UID}
         - DOMAIN=${DOMAIN}
-        - OPENAI_API_KEY=${OPENAI_API_KEY}
-        - REDIS_URL=${REDIS_URL}
-        - DATABASE_URL=${DATABASE_URL}
-        - SENTRY_DSN=${SENTRY_DSN}
         - CREATE_IDEA_LIMITER_LIMIT=${CREATE_IDEA_LIMITER_LIMIT}
         - CREATE_IDEA_LIMITER_TIMEFRAME=${CREATE_IDEA_LIMITER_TIMEFRAME}
         - IDEA_SERVICE_API_BASE=${IDEA_SERVICE_API_BASE}

knip.json

@@ -0,0 +1,3 @@
+{
+  "ignoreDependencies": ["sharp"]
+}

next.config.mjs

@@ -1,4 +1,3 @@
-import withBundleAnalyzer from '@next/bundle-analyzer'
 import { withSentryConfig } from '@sentry/nextjs'
 
 /** @type {import('next').NextConfig} */
@@ -13,13 +12,7 @@ const nextConfig = {
   },
 }
 
-const bundleAnalyzer = withBundleAnalyzer({
-  enabled: process.env.ANALYZE === 'true',
-  analyzerMode: 'static',
-  logLevel: 'info',
-})
-
-export default withSentryConfig(bundleAnalyzer(nextConfig), {
+export default withSentryConfig(nextConfig, {
   // For all available options, see:
   // https://github.com/getsentry/sentry-webpack-plugin#options