From 6c523b8246fd47704742432063ab78ce09ace7ff Mon Sep 17 00:00:00 2001
From: gibbyb <gib@gibbyb.com>
Date: Mon, 27 Oct 2025 16:04:01 -0500
Subject: [PATCH] Trying to match server before I throw away all of those
 changes as well

---
 apps/next/.dockerignore |  8 -------
 docker/Dockerfile       | 46 +++++++++++++----------------------------
 2 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 apps/next/.dockerignore

diff --git a/apps/next/.dockerignore b/apps/next/.dockerignore
deleted file mode 100644
index f2c63fa..0000000
--- a/apps/next/.dockerignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.git
-node_modules
-.next
-dist
-coverage
-*.log
-docker-compose*.yml
-host/
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 75a9838..a7e257c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,55 +1,37 @@
 # syntax=docker/dockerfile:1
-
-# --- Bun on Alpine for build ---
 FROM oven/bun:alpine AS base
-
-# --- deps: install node_modules with Bun ---
 FROM base AS deps
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
+COPY apps/next/package.json apps/next/bun.lockb* ./
+RUN bun install --frozen-lockfile
 
-# Copy package + whichever Bun lock file you have (optional)
-COPY package.json bun.lockb* bun.lock* ./
-COPY tsconfig.base.json ./
-COPY apps/next/package.json ./apps/next/
-
-# If bun.lockb exists, enforce frozen; otherwise install and generate it
-RUN if [ -f bun.lockb ]; then \
-      bun install --frozen-lockfile; \
-    else \
-      bun install; \
-    fi
-
-# --- builder: build Next.js with Bun ---
 FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/tsconfig.base.json ./tsconfig.base.json
-COPY apps/next ./apps/next
-COPY packages ./packages
-WORKDIR /app/apps/next
+COPY tsconfig.base.json /tsconfig.base.json
+COPY packages/backend ./packages/backend
+COPY apps/next ./
 ENV NEXT_TELEMETRY_DISABLED=1
 RUN bun run build
 
-# --- runner: Node on Alpine to run server.js ---
+#FROM base AS runner
 FROM node:20-alpine AS runner
 WORKDIR /app
+
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
-# non-root user
 RUN addgroup -S nodejs -g 1001 && adduser -S nextjs -u 1001
-COPY --from=builder /app/apps/next/public ./public
-RUN mkdir .next && chown -R nextjs:nodejs .next
-RUN mkdir -p .next/cache && chown -R nextjs:nodejs .next
+#RUN adduser --system --uid 1001 nextjs
+#RUN chown nextjs:bun .next
 
-# Next standalone output
-COPY --from=builder /app/apps/next/.next/standalone ./
-COPY --from=builder /app/apps/next/.next/static ./.next/static
-COPY --from=builder /app/node_modules ./node_modules
+# Copy from the correct paths (builder has apps/next at root)
+COPY --from=builder --chown=nextjs:nodejs /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
 USER nextjs
 EXPOSE 3000
-ENV PORT=3000
-ENV HOSTNAME=0.0.0.0
+
 CMD ["node", "server.js"]