From 547f566fc20466df0eac5a8ef78642d21ee5c0a9 Mon Sep 17 00:00:00 2001 From: ga1az Date: Tue, 24 Jun 2025 23:44:06 -0400 Subject: [PATCH 1/2] refactor(docker): update Dockerfile and docker-compose for improved build process and add health check API --- apps/web/Dockerfile | 42 ++++++++++++++++++---------- apps/web/next.config.ts | 1 + apps/web/src/app/api/health/route.ts | 5 ++++ docker-compose.yaml | 2 +- 4 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 apps/web/src/app/api/health/route.ts diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index ca1f098..49820e7 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,16 +1,27 @@ -FROM oven/bun:latest AS base +FROM oven/bun:alpine AS base -# Install dependencies -FROM base AS deps -WORKDIR /app -COPY package.json bun.lock ./ -RUN bun install --frozen-lockfile - -# Build the application FROM base AS builder + WORKDIR /app -COPY --from=deps /app/node_modules ./node_modules -COPY . . + +COPY package.json package.json +COPY bun.lock bun.lock +COPY turbo.json turbo.json + +COPY apps/web/package.json apps/web/package.json +COPY packages/db/package.json packages/db/package.json +COPY packages/auth/package.json packages/auth/package.json + +RUN bun install + +COPY apps/web/ apps/web/ +COPY packages/db/ packages/db/ +COPY packages/auth/ packages/auth/ + +ENV NODE_ENV=production +ENV NEXT_TELEMETRY_DISABLED=1 + +WORKDIR /app/apps/web RUN bun run build # Production image @@ -18,13 +29,16 @@ FROM base AS runner WORKDIR /app ENV NODE_ENV=production +ENV NEXT_TELEMETRY_DISABLED=1 RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs -COPY --from=builder /app/public ./public -COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ -COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static +COPY --from=builder --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public +COPY --from=builder --chown=nextjs:nodejs /app/apps/web/.next/standalone ./ +COPY --from=builder --chown=nextjs:nodejs /app/apps/web/.next/static ./apps/web/.next/static + +RUN chown nextjs:nodejs apps USER nextjs @@ -33,4 +47,4 @@ EXPOSE 3000 ENV PORT=3000 ENV HOSTNAME="0.0.0.0" -CMD ["bun", "server.js"] \ No newline at end of file +CMD ["bun", "apps/web/server.js"] \ No newline at end of file diff --git a/apps/web/next.config.ts b/apps/web/next.config.ts index de7fefe..319ca13 100644 --- a/apps/web/next.config.ts +++ b/apps/web/next.config.ts @@ -6,6 +6,7 @@ const nextConfig: NextConfig = { }, reactStrictMode: true, productionBrowserSourceMaps: true, + output: "standalone", }; export default nextConfig; diff --git a/apps/web/src/app/api/health/route.ts b/apps/web/src/app/api/health/route.ts new file mode 100644 index 0000000..ecb9ce0 --- /dev/null +++ b/apps/web/src/app/api/health/route.ts @@ -0,0 +1,5 @@ +import { NextRequest } from "next/server"; + +export async function GET(request: NextRequest) { + return new Response("OK", { status: 200 }); +} diff --git a/docker-compose.yaml b/docker-compose.yaml index f5973f3..e3fc55a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -48,7 +48,7 @@ services: start_period: 10s web: build: - context: ./apps/web + context: . dockerfile: ./apps/web/Dockerfile restart: unless-stopped ports: From 1f2c505efea465a1ff8c8c0e435490dfe16637ec Mon Sep 17 00:00:00 2001 From: ga1az Date: Tue, 24 Jun 2025 23:59:42 -0400 Subject: [PATCH 2/2] chore(docker): enhance Dockerfile by adding dependency installation step and removing redundant NODE_ENV variable --- apps/web/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 49820e7..8b13ce3 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,5 +1,6 @@ FROM oven/bun:alpine AS base +# Install dependencies and build the application FROM base AS builder WORKDIR /app @@ -18,7 +19,6 @@ COPY apps/web/ apps/web/ COPY packages/db/ packages/db/ COPY packages/auth/ packages/auth/ -ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 WORKDIR /app/apps/web @@ -28,7 +28,6 @@ RUN bun run build FROM base AS runner WORKDIR /app -ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 RUN addgroup --system --gid 1001 nodejs