Merge branch 'development_branch' of https://github.com/CS3219-AY2425…

…S1/cs3219-ay2425s1-project-g38 into development_branch
CS3219-AY2425S1 · Nov 9, 2024 · 7a29119 · 7a29119
2 parents e8b5182 + 5e3ded5
commit 7a29119
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/kubernetes/collab-service/collab-service-deployment.yaml b/kubernetes/collab-service/collab-service-deployment.yaml
@@ -30,6 +30,6 @@ spec:
             - secretRef:
                 name: collab-secrets
           resources:
-            requests:
-              memory: "250Mi"
-              cpu: "100m"
+            limits:
+              memory: "1Gi"
+              cpu: "250m"
diff --git a/kubernetes/matching-service/matching-service-deployment.yaml b/kubernetes/matching-service/matching-service-deployment.yaml
@@ -31,5 +31,5 @@ spec:
                 name: matching-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"
diff --git a/kubernetes/question-service/question-service-deployment.yaml b/kubernetes/question-service/question-service-deployment.yaml
@@ -31,5 +31,5 @@ spec:
                 name: app-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"
diff --git a/kubernetes/user-service/user-service-deployment.yaml b/kubernetes/user-service/user-service-deployment.yaml
@@ -31,5 +31,5 @@ spec:
                 name: user-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"
diff --git a/question-service/Dockerfile b/question-service/Dockerfile
@@ -10,4 +10,6 @@ COPY ./src ./src
 
 COPY ./tsconfig.json ./
 
+RUN npm run build
+
 CMD ["npm", "start"]
diff --git a/question-service/package.json b/question-service/package.json
@@ -5,7 +5,7 @@
   "main": "dist/server.js",
   "scripts": {
     "build": "npx tsc",
-    "start": "ts-node src/server.ts",
+    "start": "node dist/server.js",
     "dev": "nodemon src/server.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@ COPY ./src ./src

		COPY ./tsconfig.json ./

		RUN npm run build

		CMD ["npm", "start"]