feat: improve Docker setup and simplify Mongo setup

Author: chrisgoggins

.dockerignore

@@ -9,6 +9,6 @@ coverage
 dist
 build
 *.log
-.env.local
-.env.*.local
+.env*
+!.env.example
 .turbo

.env.example

@@ -1,4 +1,6 @@
-MONGODB_URI=mongodb://localhost:27017/able-alliance
+# Docker Compose defaults; use localhost URLs when running services on the host.
+MONGODB_URI=mongodb://mongo:27017/able-alliance
+WATCHPACK_POLLING=true
 
 # SuperAdmin — seeded on server startup if not already in DB
 SUPERADMIN_FIRSTNAME=Super
@@ -7,11 +9,14 @@ SUPERADMIN_CAS_USERNAME=superadmin
 
 # NextAuth
 NEXTAUTH_SECRET=dev-secret-change-in-production
+AUTH_TRUST_HOST=true
 DEPLOY_PRIME_URL=http://localhost:3000
+# Server-to-server URL for the websocket server to reach the Next.js app
+APP_INTERNAL_URL=http://app:3000
 
 # CAS Authentication
-# Server-to-server CAS URL (e.g. use http://cas:8443/cas when running in Docker)
-CAS_BASE_URL=http://localhost:8443/cas
+# Server-to-server CAS URL
+CAS_BASE_URL=http://cas:8443/cas
 # Browser-facing URL (used for login redirects visible to the user)
 CAS_BASE_URL_BROWSER=http://localhost:8443/cas
 
@@ -24,8 +29,7 @@ JUNO_EMAIL_SENDER_NAME=Able Alliance
 # WebSocket server for real-time chat and toast notifications
 NEXT_PUBLIC_WS_URL=http://localhost:4000
 # Server-to-server URL for the Next.js app to reach the websocket server
-# (e.g. http://websocket:4000 when running in Docker)
-WEBSOCKET_INTERNAL_URL=http://localhost:4000
+WEBSOCKET_INTERNAL_URL=http://websocket:4000
 # Shared secret authorizing the Next.js app to push notifications via the
 # websocket server's internal /notify endpoint. Must match the value the
 # websocket server is started with.

Dockerfile.dev

@@ -1,33 +1,12 @@
-# ── Stage 1: deps ────────────────────────────────────────────────────────────
-# Install node_modules in an isolated layer so they are only reinstalled when
-# package-lock.json changes, not on every source code change.
-FROM node:24-slim AS deps
+FROM node:24-slim
 
 WORKDIR /app
 
-# Copy only the lockfiles — changes to source never invalidate this layer
 COPY package.json package-lock.json ./
+RUN npm ci
 
-# ci installs exact versions from the lockfile; --prefer-offline avoids
-# redundant registry requests when the layer is cached
-RUN --mount=type=cache,target=/root/.npm \
-    npm ci --prefer-offline
-
-# ── Stage 2: dev ─────────────────────────────────────────────────────────────
-# Runtime image — source is bind-mounted at run time, not baked in.
-FROM node:24-slim AS dev
-
-WORKDIR /app
-
-# Copy node_modules from deps stage
-COPY --from=deps /app/node_modules ./node_modules
-
-# Copy static config files that don't change often
-# (source and public are bind-mounted via docker-compose volumes)
-COPY package.json package-lock.json ./
 COPY next.config.ts tsconfig.json postcss.config.mjs ./
 
 EXPOSE 3000
 
-# Docker Compose supplies the development command so it can filter noisy watch output.
 CMD ["npm", "run", "dev"]

Dockerfile.prod

@@ -0,0 +1,16 @@
+FROM node:24-slim
+
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY . .
+RUN --mount=type=secret,id=app_env,target=/app/.env \
+    npm run build && rm -rf .next/cache
+
+ENV NODE_ENV=production
+
+EXPOSE 3000
+
+CMD ["npm", "run", "start"]

README.md

@@ -6,13 +6,20 @@ Able Alliance is a GT student organization that is dedicated to improving on-cam
 
 ## Deployment Preview
 
-A deployment preview of the main branch from netlify is available [here](https://able-alliance.netlify.app/). The
-websocket express js server is hosted seperately [here](https://able-alliance.onrender.com).
-
-The mock cas express js server is hosted seperately [here](https://able-alliance-mock-cas.onrender.com)
+A deployment preview of the main branch from netlify is available [here](https://able-alliance.netlify.app/).
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/85fa2c6e-6dac-463a-8467-1d6d02d37cb3/deploy-status)](https://app.netlify.com/projects/able-alliance/deploys)
 
+## Environment Setup
+
+Copy `.env.example` to `.env` and fill in your API keys:
+
+```sh
+cp .env.example .env
+```
+
+For host development, use `localhost` instead of Docker service names.
+
 ## Development Setup
 
 - Install [Node.js 24](https://nodejs.org/en/download/)
@@ -26,11 +33,6 @@ The mock cas express js server is hosted seperately [here](https://able-alliance
   ```sh
   npm ci
   ```
-- Create a `.env` file in the project root with `MONGODB_URI`. Copy from `.env.example`:
-  ```sh
-  cp .env.example .env
-  ```
-  Then set `MONGODB_URI=mongodb://localhost:27017/able-alliance` (or your MongoDB connection string).
 - Start the Next.js dev server:
   ```sh
   npm run dev
@@ -39,25 +41,22 @@ The mock cas express js server is hosted seperately [here](https://able-alliance
 
 ## Run With Docker
 
-1. Install [Docker](https://docs.docker.com/engine/install/).
-2. From the project root, start the app and MongoDB with Docker Compose:
-   ```sh
-   docker compose up
-   ```
-   The app service receives `MONGODB_URI` from the Compose file (`mongodb://mongo:27017/able-alliance?replicaSet=rs0`). No extra env file is required for Docker.
-3. To rebuild after changing dependencies, run:
-   `docker compose down -v`
-   to delete the old containers and volumes and then rebuild with
-   ` docker compose up --build`
-
-Note: If you run Mongo via Docker Compose, avoid starting another MongoDB on `localhost:27017`; Compose will start Mongo inside the stack and expose it.
+- Install [Docker](https://docs.docker.com/engine/install/).
+- Development:
+  ```sh
+  docker compose up --build --watch
+  ```
+- Production:
+  ```sh
+  docker compose -f docker-compose-prod.yml up --build
+  ```
 
 ### Seeding the Database
 
 To seed the database with sample users, locations, vehicles, and routes, run:
 
 ```sh
-npm run seed -- "mongodb://localhost:27017/able-alliance?replicaSet=rs0&directConnection=true"
+npm run seed -- "mongodb://localhost:27017/able-alliance"
 ```
 
 ## Major Technologies

docker-compose-prod.yml

@@ -0,0 +1,74 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.prod
+      secrets:
+        - app_env
+    env_file: .env
+    ports:
+      - "3000:3000"
+    networks:
+      - able-alliance-net
+    depends_on:
+      mongo:
+        condition: service_healthy
+      cas:
+        condition: service_started
+    command: npm run start
+
+  mongo:
+    image: mongo:7.0
+    ports:
+      - "27017:27017"
+    networks:
+      - able-alliance-net
+    volumes:
+      - mongodb-data:/data/db
+    logging:
+      driver: "none"
+    healthcheck:
+      test:
+        ["CMD", "mongosh", "--eval", "db.adminCommand({ ping: 1 })", "--quiet"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
+
+  cas:
+    build:
+      context: ./mock-cas-server
+      dockerfile: Dockerfile
+    env_file: .env
+    environment:
+      PORT: "8443"
+    ports:
+      - "8443:8443"
+    networks:
+      - able-alliance-net
+
+  websocket:
+    build:
+      context: .
+      dockerfile: websocket-server/Dockerfile
+    ports:
+      - "4000:4000"
+    depends_on:
+      mongo:
+        condition: service_healthy
+    env_file: .env
+    environment:
+      PORT: "4000"
+    networks:
+      - able-alliance-net
+
+networks:
+  able-alliance-net:
+    driver: bridge
+
+volumes:
+  mongodb-data:
+
+secrets:
+  app_env:
+    file: .env

docker-compose.yml

@@ -3,23 +3,7 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.dev
-    environment:
-      JUNO_API_KEY: "your-juno-api-key"
-      JUNO_BASE_URL: "your-juno-url"
-      MONGODB_URI: "mongodb://mongo:27017/able-alliance?replicaSet=rs0"
-      NEXTAUTH_SECRET: "dev-secret-change-in-production"
-      DEPLOY_PRIME_URL: "http://localhost:3000"
-      CAS_BASE_URL: "http://cas:8443/cas"
-      CAS_BASE_URL_BROWSER: "http://localhost:8443/cas"
-      SUPERADMIN_FIRSTNAME: "Super"
-      SUPERADMIN_LASTNAME: "Admin"
-      # The CAS identity for the SuperAdmin. Set explicitly in both services so
-      # the app and the mock CAS server cannot disagree about who can log in.
-      SUPERADMIN_CAS_USERNAME: "superadmin"
-      WATCHPACK_POLLING: "true"
-      NEXT_PUBLIC_WS_URL: "http://localhost:4000"
-      WEBSOCKET_INTERNAL_URL: "http://websocket:4000"
-      WEBSOCKET_INTERNAL_SECRET: "dev-internal-secret-change-in-production"
+    env_file: .env
     develop:
       watch:
         - action: rebuild
@@ -33,11 +17,9 @@ services:
       - ./emails:/app/emails
       - ./scripts:/app/scripts
       - ./public:/app/public
-      - ./.env:/app/.env
       - ./next.config.ts:/app/next.config.ts
       - ./tsconfig.json:/app/tsconfig.json
       - ./postcss.config.mjs:/app/postcss.config.mjs
-      - node_modules:/app/node_modules
       - next_cache:/app/.next
     ports:
       - "3000:3000"
@@ -59,14 +41,13 @@ services:
       - "27017:27017"
     networks:
       - able-alliance-net
-    entrypoint: ["/bin/bash", "/app/mongo-init.sh"]
     volumes:
       - mongodb-data:/data/db
-      - ./mongo-init.sh:/app/mongo-init.sh
     logging:
       driver: "none"
     healthcheck:
-      test: ["CMD", "mongosh", "--eval", "rs.status().ok", "--quiet"]
+      test:
+        ["CMD", "mongosh", "--eval", "db.adminCommand({ ping: 1 })", "--quiet"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -76,13 +57,9 @@ services:
     build:
       context: ./mock-cas-server
       dockerfile: Dockerfile
+    env_file: .env
     environment:
       PORT: "8443"
-      SUPERADMIN_FIRSTNAME: "Super"
-      SUPERADMIN_LASTNAME: "Admin"
-      # The CAS identity for the SuperAdmin. Set explicitly in both services so
-      # the app and the mock CAS server cannot disagree about who can log in.
-      SUPERADMIN_CAS_USERNAME: "superadmin"
     ports:
       - "8443:8443"
     networks:
@@ -97,11 +74,9 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
+    env_file: .env
     environment:
-      - MONGODB_URI=mongodb://mongo:27017/able-alliance?replicaSet=rs0
-      - NEXTAUTH_SECRET=dev-secret-change-in-production
-      - DEPLOY_PRIME_URL=http://app:3000
-      - WEBSOCKET_INTERNAL_SECRET=dev-internal-secret-change-in-production
+      PORT: "4000"
     networks:
       - able-alliance-net
 
@@ -111,5 +86,4 @@ networks:
 
 volumes:
   mongodb-data:
-  node_modules:
   next_cache:

mock-cas-server/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+.env*