chore(docker): Update user service

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/collaboration/docker-compose.yml

@@ -29,14 +29,12 @@ services:
     ports:
       - "9003:8001"
     command: node dist/index.js
+    env_file:
+      - ./.env.local
     environment:
       # Docker Compose Specific
       - EXPRESS_DB_HOST=collab-db
       - EXPRESS_DB_PORT=5432
-      # Env File vars
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     depends_on:
       - collab-db
 volumes:

backend/question/docker-compose.yml

@@ -29,15 +29,14 @@ services:
     ports:
       - "9002:8001"
     command: node dist/index.js
+    env_file:
+      - ./.env.local
     environment:
       # Docker Compose Specific
       - EXPRESS_DB_HOST=question-db
       - EXPRESS_DB_PORT=5432
-      # Env File vars
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     depends_on:
       - question-db
+      
 volumes:
   question-db-docker:

backend/user/.env.local

@@ -1,6 +1,9 @@
+EXPRESS_ENV="local"
 EXPRESS_DB_HOST="localhost"
 EXPRESS_DB_PORT=5431
 POSTGRES_DB="user"
 POSTGRES_USER="peerprep-user-express"
 POSTGRES_PASSWORD="69/X8JxtAVsM+0YHT4RR5D7Ahf7bTobI4EED64FrzIU="
 PGDATA="/data/user-db"
+
+EXPRESS_JWT_SECRET_KEY="jd+9qlXA0a3YsmVf2KJgyiJ3SprIR318IAwhRXck4Y8="

backend/user/docker-compose.yml

@@ -1,36 +1,42 @@
+# Command: docker-compose --env-file .env.local up -d
+
 services:
-  postgres:
-    hostname: postgres
+  user-db:
+    hostname: "user-db"
     image: postgres:16.4
-    container_name: "user_db"
+    container_name: "user-db"
     build:
       context: ./src/lib/db
-    environment:
-      POSTGRES_DB: "User"
-      POSTGRES_USER: "user"
-      POSTGRES_PASSWORD: "user"
-      PGDATA: "/data/user-db"
+    env_file:
+      - ./.env.local
     volumes:
-       - "user-db-docker:/data/user-db"
+      - "user-db-docker:${PGDATA}"
       #  - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     ports:
-      - "5431:5432"
+      - "${EXPRESS_DB_PORT}:5432"
     restart: unless-stopped
 
-  express:
+  user-express:
     image: "user-express"
     container_name: "user-express"
     build:
       context: ./
       dockerfile: ./express.Dockerfile
       target: build
+      args: 
+        # For building with the correct env vars
+        - env=${EXPRESS_ENV}
     ports:
       - "9001:8001"
     command: node dist/index.js
+    env_file:
+      - ./.env.local
+    environment:
+      # Docker Compose Specific
+      - EXPRESS_DB_HOST=user-db
+      - EXPRESS_DB_PORT=5432
     depends_on:
-      postgres:
-        condition: service_started
-        restart: true
+      - user-db
 
 volumes:
   user-db-docker:

backend/user/drizzle.config.ts

@@ -1,14 +1,16 @@
 import { defineConfig } from 'drizzle-kit';
 
+const config = {
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB!,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+};
+
 export default defineConfig({
   schema: './src/lib/db/schema.ts',
   out: './drizzle',
   dialect: 'postgresql',
-  dbCredentials: {
-    host: 'localhost',
-    port: 5431,
-    database: 'User',
-    user: 'user',
-    password: 'user',
-  },
+  dbCredentials: config,
 });

backend/user/drizzle.migrate.mts

@@ -0,0 +1,21 @@
+import postgres from 'postgres';
+import { drizzle } from 'drizzle-orm/postgres-js';
+import { migrate } from 'drizzle-orm/postgres-js/migrator';
+
+const config = {
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+};
+const migrationConnection = postgres({ ...config, max: 1 });
+
+const db = drizzle(migrationConnection);
+
+const main = async () => {
+  await migrate(db, { migrationsFolder: 'drizzle' });
+  await migrationConnection.end();
+};
+
+void main();

backend/user/drizzle.migrate.ts

@@ -1,14 +1,17 @@
 FROM node:lts-alpine AS build
-WORKDIR /data/user-express
+WORKDIR /data/question-express
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
 
 FROM node:lts-alpine AS production
-WORKDIR /data/user-express
-COPY --from=build /data/user-express/package*.json ./
+WORKDIR /data/question-express
+COPY --from=build /data/question-express/package*.json ./
 RUN npm ci --omit=dev
-COPY --from=build --chown=node:node /data/user-express/dist ./dist
+COPY --from=build --chown=node:node /data/question-express/dist ./dist
+
+ARG env
+COPY ".env.${env}" .
 EXPOSE 8001
-ENTRYPOINT ["node", "dist/index.js"]
+CMD [ "npm", "run", "start" ]

backend/user/express.Dockerfile

@@ -3,13 +3,15 @@
   "version": "1.0.0",
   "main": "dist/index.js",
   "scripts": {
-    "dev": "nodemon src/index.ts | pino-pretty",
-    "build": "tsc",
-    "start": "node dist/index.js",
+    "dev": "env-cmd -f .env.local nodemon src/index.ts | pino-pretty",
+    "build": "env-cmd -f .env.local tsc && tsc-alias",
+    "start": "env-cmd -f .env.local node dist/index.js",
+    "build:prod": "env-cmd -f .env.prod tsc && tsc-alias",
+    "start:prod": "env-cmd -f .env.local node dist/index.js",
+    "db:generate": "env-cmd -f .env.local drizzle-kit generate",
+    "db:migrate": "env-cmd -f .env.local tsx drizzle.migrate.ts",
+    "db:inspect": "env-cmd -f .env.local drizzle-kit studio",
     "fmt": "prettier --config .prettierrc src --write",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "tsx drizzle.migrate.mts",
-    "db:inspect": "drizzle-kit studio",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
@@ -19,6 +21,7 @@
   "dependencies": {
     "bcrypt": "^5.1.1",
     "drizzle-orm": "^0.33.0",
+    "env-cmd": "^10.1.0",
     "express": "^4.21.0",
     "express-rate-limit": "^7.4.0",
     "helmet": "^7.1.0",
@@ -40,6 +43,7 @@
     "pino-pretty": "^11.2.2",
     "regenerator-runtime": "^0.14.1",
     "ts-node": "^10.9.2",
+    "tsc-alias": "^1.8.10",
     "tsconfig-paths": "^4.2.0"
   }
 }

backend/user/package.json

@@ -1,14 +1,9 @@
-export const JWT_SECRET_KEY = 'secret';
+export const JWT_SECRET_KEY = process.env.EXPRESS_JWT_SECRET_KEY!;
 
-const DB_HOST = 'localhost';
-const DB_PORT = 5431;
-const DB_NAME = 'User';
-const DB_USER = 'user';
-const DB_PASSWORD = 'user';
 export const dbConfig = {
-  host: DB_HOST,
-  port: DB_PORT,
-  database: DB_NAME,
-  user: DB_USER,
-  password: DB_PASSWORD,
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB!,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
 };