Merge branch 'main' into anun/docker-question

Author: anunayajoshi

backend/collaboration/package.json

@@ -36,6 +36,7 @@
     "nodemon": "^3.1.4",
     "pino-pretty": "^11.2.2",
     "ts-node": "^10.9.2",
-    "tsc-alias": "^1.8.10"
+    "tsc-alias": "^1.8.10",
+    "tsx": "^4.19.1"
   }
 }

backend/question/package.json

@@ -44,6 +44,7 @@
     "pino-pretty": "^11.2.2",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
-    "tsconfig-paths": "^4.2.0"
+    "tsconfig-paths": "^4.2.0",
+    "tsx": "^4.19.1"
   }
 }

backend/user/entrypoint.sh

@@ -6,4 +6,8 @@ npm run db:prod:migrate
 # Checks admin table and will not seed if data exists
 npm run db:prod:seed
 
+rm -rf drizzle src tsconfig.json
+
+npm uninstall tsx drizzle-kit
+
 npm run start

backend/user/express.Dockerfile

@@ -9,9 +9,18 @@ RUN npm run build
 FROM node:lts-alpine AS production
 WORKDIR /data/user-express
 COPY --from=build /data/user-express/package*.json ./
-RUN npm ci --omit=dev
 COPY --from=build --chown=node:node /data/user-express/dist ./dist
 
+RUN npm ci --omit=dev
+# For migration
+RUN npm install tsx drizzle-kit
+COPY drizzle ./drizzle
+COPY src/lib/db/ ./src/lib/db
+COPY src/lib/passwords ./src/lib/passwords
+COPY src/config.ts ./src
+COPY tsconfig.json .
+COPY entrypoint.sh .
+
 ARG port
 EXPOSE ${port}
-CMD [ "npm", "run", "start" ]
+ENTRYPOINT [ "/bin/sh", "entrypoint.sh" ]

backend/user/package.json

@@ -35,8 +35,7 @@
     "jsonwebtoken": "^9.0.2",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
-    "postgres": "^3.4.4",
-    "tsx": "^4.19.1"
+    "postgres": "^3.4.4"
   },
   "devDependencies": {
     "@swc/core": "^1.7.26",
@@ -53,6 +52,7 @@
     "regenerator-runtime": "^0.14.1",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
-    "tsconfig-paths": "^4.2.0"
+    "tsconfig-paths": "^4.2.0",
+    "tsx": "^4.19.1"
   }
 }

docker-compose.yaml

@@ -70,8 +70,8 @@ services:
     container_name: "user-express"
     build:
       context: ./backend/user
-      dockerfile: ./express.Dockerfile
-      target: build
+      dockerfile: express.Dockerfile
+      target: production
       args: 
         # For building with the correct env vars
         - env=${USER_EXPRESS_ENV}
@@ -91,7 +91,12 @@ services:
     networks:
       - user-db-network
       - user-api-network
-    entrypoint: ["/bin/sh", "entrypoint.sh"]
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:9001/health || exit 1
+      interval: 30s 
+      timeout: 10s   
+      retries: 5       
+      start_period: 5s
 
 volumes:
   # Persistent Volumes for Databases