Following steps to dockerise

Author: anunayajoshi

backend/question/.env.compose

@@ -0,0 +1,12 @@
+EXPRESS_ENV="compose"
+PEERPREP_UI_HOST="http://frontend:3000"  
+
+EXPRESS_PORT=9002
+EXPRESS_DB_HOST="qn-db"
+EXPRESS_DB_PORT=5433
+POSTGRES_DB="question"
+POSTGRES_USER="peerprep-qn-express"
+POSTGRES_PASSWORD="Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ="
+PGDATA="/data/qn-db"
+
+EXPRESS_JWT_SECRET_KEY="jd+9qlXA0a3YsmVf2KJgyiJ3SprIR318IAwhRXck4Y8="

backend/question/.env.docker

@@ -0,0 +1,12 @@
+EXPRESS_ENV=local
+PEERPREP_UI_HOST=http://localhost:5173
+
+EXPRESS_PORT=9002
+EXPRESS_DB_HOST=host.docker.internal
+EXPRESS_DB_PORT=5433
+POSTGRES_DB=question
+POSTGRES_USER=peerprep-qn-express
+POSTGRES_PASSWORD=Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ=
+PGDATA=/data/qn-db
+
+EXPRESS_JWT_SECRET_KEY=jd+9qlXA0a3YsmVf2KJgyiJ3SprIR318IAwhRXck4Y8=

backend/question/docker-compose.yml

@@ -25,9 +25,9 @@ services:
       target: build
       args: 
         # For building with the correct env vars
-        - env=${EXPRESS_ENV}
+        - port=${EXPRESS_PORT}
     ports:
-      - "9002:8001"
+      - "9001:${EXPRESS_PORT}"
     command: node dist/index.js
     env_file:
       - ./.env.local

backend/question/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Drizzle will handle its own logic to remove conflicts
+npm run db:prod:migrate
+
+# Checks admin table and will not seed if data exists
+npm run db:prod:seed
+
+npm run start

backend/question/express.Dockerfile

@@ -11,7 +11,6 @@ COPY --from=build /data/question-express/package*.json ./
 RUN npm ci --omit=dev
 COPY --from=build --chown=node:node /data/question-express/dist ./dist
 
-ARG env
-COPY ".env.${env}" .
-EXPOSE 8001
+ARG port
+EXPOSE ${port}
 CMD [ "npm", "run", "start" ]

backend/question/package.json

@@ -4,13 +4,15 @@
   "main": "dist/index.js",
   "scripts": {
     "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",
+    "build": "tsc && tsc-alias",
+    "start": "node dist/index.js",
+    "build:local": "env-cmd -f .env.local tsc && tsc-alias",
+    "start:local": "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 ./src/lib/db/migrate.ts",
     "db:seed": "env-cmd -f .env.local tsx ./src/lib/db/seed.ts",
+    "db:prod:migrate": "tsx ./src/lib/db/migrate.ts",
+    "db:prod:seed": "tsx ./src/lib/db/seed.ts",
     "db:inspect": "env-cmd -f .env.local drizzle-kit studio",
     "fmt": "prettier --config .prettierrc src --write",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,6 +23,7 @@
   "description": "",
   "dependencies": {
     "cors": "^2.8.5",
+    "dotenv": "^16.4.5",
     "drizzle-orm": "^0.33.0",
     "env-cmd": "^10.1.0",
     "express": "^4.21.0",
@@ -33,6 +36,7 @@
   "devDependencies": {
     "@swc/core": "^1.7.26",
     "@swc/helpers": "^0.5.13",
+    "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/node": "^22.5.5",
     "drizzle-kit": "^0.24.2",