Docker cleanup (#157)

* Split dev and prod docker compose

* Update .env.sample

Author: jq1836

.env.sample

@@ -1,19 +1,18 @@
-# Common variables
-BUILD_ENV=dev
+## Common variables
+COMPOSE_PATH_SEPARATOR=:
+# Replace string between '...compose.' and '.yml' with 'dev' or 'prod'
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
 
-# Frontend variables
+## Frontend variables
 FRONTEND_PORT=3000
 
-# Question service variables
-QUESTION_SVC_PORT=8000
+## Question service variables
+QUESTION_SVC_PORT=
 QUESTION_SVC_DB_URI=
 
-
-# User service variables
-USER_SVC_ENV=PROD
-USER_SVC_PORT=3001
+## User service variables
+USER_SVC_PORT=
 USER_SVC_DB_URI=
-USER_SVC_DB_LOCAL_URI=
 JWT_SECRET=
 EMAIL_ADDRESS=
 EMAIL_PASSWORD=

docker-compose.dev.yml

@@ -0,0 +1,20 @@
+# Base file is docker-compose.yml
+services:
+  frontend:
+    build:
+      target: dev
+    volumes:
+      - ./frontend/app:/app/app
+      - ./frontend/components:/app/components
+
+  question-service:
+    environment:
+      - BUILD_ENV=dev
+    volumes:
+      - ./question-service/app:/app/app
+  
+  user-service:
+    build:
+      target: dev
+    volumes:
+      - ./user-service/app:/app/app

docker-compose.prod.yml

@@ -0,0 +1,13 @@
+# Base file is docker-compose.yml
+services:
+  frontend:
+    build:
+      target: prod
+
+  question-service:
+    environment:
+      - BUILD_ENV=prod
+  
+  user-service:
+    build:
+      target: prod

docker-compose.yml

@@ -2,7 +2,6 @@ services:
   frontend:
     build:
       context: ./frontend
-      target: $BUILD_ENV
     ports:
       - $FRONTEND_PORT:$FRONTEND_PORT
     depends_on:
@@ -12,27 +11,20 @@ services:
   question-service:
     build:
       context: ./question-service
-      target: $BUILD_ENV
     ports:
       - $QUESTION_SVC_PORT:$QUESTION_SVC_PORT
     environment:
       - PORT=$QUESTION_SVC_PORT
-      - DB_CLOUD_URI=$QUESTION_SVC_DB_URI
+      - DB_URI=$QUESTION_SVC_DB_URI
 
   user-service:
     build:
       context: ./user-service
-      target: $BUILD_ENV
     ports:
       - $USER_SVC_PORT:$USER_SVC_PORT
     environment:
-      - ENV=$USER_SVC_ENV
       - PORT=$USER_SVC_PORT
-      - DB_CLOUD_URI=$USER_SVC_DB_URI
-      - DB_LOCAL_URI=$USER_SVC_DB_LOCAL_URI
+      - DB_URI=$USER_SVC_DB_URI
       - JWT_SECRET=$JWT_SECRET
       - EMAIL_ADDRESS=$EMAIL_ADDRESS
       - EMAIL_PASSWORD=$EMAIL_PASSWORD
-    volumes:
-      - ./user-service:/app
-      - /app/node_modules

frontend/Dockerfile

@@ -1,19 +1,20 @@
-# Build stage
+# Base stage
 FROM node:20-alpine AS base
 WORKDIR /app
-COPY package.json yarn.lock ./
+COPY package.json .
+COPY yarn.lock .
 RUN yarn install --frozen-lockfile
 
-# Development stage
-FROM base AS dev
-COPY . .
-CMD ["yarn", "dev"]
-
 # Production build stage
 FROM base AS build
 COPY . .
 RUN yarn build
 
+# Development stage
+FROM base AS dev
+COPY . .
+CMD ["yarn", "dev"]
+
 # Production runtime stage
 FROM build AS prod
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

frontend/next.config.mjs

@@ -1,4 +1,15 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+  reactStrictMode: true,
+  swcMinify: true,
+  // except for webpack, other parts are left as generated
+  webpack: (config, context) => {
+    config.watchOptions = {
+      poll: 1000,
+      aggregateTimeout: 300,
+    };
+    return config;
+  },
+};
 
 export default nextConfig;