Prepare files for deployment

rayyan35p · rayyan35p · commit 79c366df40d0 · 2024-11-13T14:10:38.000+08:00
diff --git a/Backend/CollabService/Dockerfile b/Backend/CollabService/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:18-alpine
 
 WORKDIR /app
 
diff --git a/Backend/CollabService/websocket/collabSocket.js b/Backend/CollabService/websocket/collabSocket.js
@@ -19,7 +19,7 @@ function setUpYjsSocket() {
     });
 
     server.listen(1234, () => {
-        console.log('Websocket server is listening on ws://localhost:1234')
+        console.log('Websocket server is listening on ws://external-ip:1234')
     })
 }
 
diff --git a/Backend/HistoryService/Dockerfile b/Backend/HistoryService/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:18-alpine
 
 WORKDIR /app
 
diff --git a/Backend/MatchingService/Dockerfile b/Backend/MatchingService/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:18-alpine
 
 WORKDIR /app
 
diff --git a/Backend/MatchingService/rabbitmq/setup.js b/Backend/MatchingService/rabbitmq/setup.js
@@ -8,8 +8,8 @@ const dead_letter_queue_name = "dead_letter_queue";
 const difficulties = ["easy", "medium", "hard", "any"];
 const axios = require('axios');
 // Matching Service code
-const questionServiceHost = process.env.QUESTION_SERVICE_HOST || 'localhost';
-const categoryAPIUrl = `http://${questionServiceHost}:3001/api/categories`;
+// const questionServiceHost = process.env.QUESTION_SERVICE_HOST || 'localhost';
+const categoryAPIUrl = `http://34.120.84.41/api/categories`;
 
 let queueNamesPromise = axios.get(categoryAPIUrl)
     .then(response => {
diff --git a/Backend/MatchingService/rabbitmq/subscriber.js b/Backend/MatchingService/rabbitmq/subscriber.js
@@ -6,8 +6,8 @@ const { v4: uuidv4 } = require('uuid');
 // matchingService/fetchQuestion.js
 const axios = require('axios');
 // Matching Service code
-const questionServiceHost = process.env.QUESTION_SERVICE_HOST || 'localhost';
-const questionAPIUrl = `http://${questionServiceHost}:3001/api/questions`;
+// const questionServiceHost = process.env.QUESTION_SERVICE_HOST || 'localhost';
+const questionAPIUrl = `http://34.120.84.41/api/questions`;
 
 
 // TODO: Subscribe and acknowledge messages with user info when timeout/user matched
diff --git a/Backend/QuestionService/Dockerfile b/Backend/QuestionService/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:18-alpine
 
 WORKDIR /app
 
diff --git a/Backend/user-service/Dockerfile b/Backend/user-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:18-alpine
 
 WORKDIR /app
 
@@ -7,5 +7,5 @@ RUN npm install
 
 COPY . .
 
-EXPOSE 8080
+EXPOSE 3002
 CMD ["npm", "start"]
diff --git a/Backend/user-service/server.js b/Backend/user-service/server.js
@@ -11,7 +11,7 @@ await connectToDB().then(() => {
   console.log("MongoDB Connected!");
 
   server.listen(port);
-  console.log("User service server listening on http://localhost:" + port);
+  console.log("User service server listening on http://external-ip:" + port);
 }).catch((err) => {
   console.error("Failed to connect to DB");
   console.error(err);
diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile
@@ -1,4 +1,5 @@
-FROM node:20
+# Use an official Node.js image as a base image
+FROM node:20 AS build
 
 WORKDIR /app
 
@@ -7,5 +8,13 @@ RUN npm install
 
 COPY . .
 
-EXPOSE 3000
-CMD ["npm", "start"]
+# Build the React app
+RUN npm run build
+# Use a lightweight web server to serve static files
+FROM nginx:alpine
+# Copy build files to NGINX's default public folder
+COPY --from=build /app/build /usr/share/nginx/html
+# Expose port 8080 for Cloud Run
+EXPOSE 8080
+# Start NGINX server
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Frontend/package.json b/Frontend/package.json
@@ -21,8 +21,9 @@
     "yjs": "^13.6.20"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "react-scripts start", 
+    "build": "react-scripts build", 
+    "serve": "serve build", 
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
diff --git a/Frontend/src/components/Sidebar.jsx b/Frontend/src/components/Sidebar.jsx
@@ -58,7 +58,8 @@ function Sidebar() {
 
         console.log("categories: ", categories)
 
-        const websocket = new WebSocket('ws://localhost:8080');
+        const matchingServiceHost = '34.126.114.137' || 'localhost';
+        const websocket = new WebSocket(`ws://${matchingServiceHost}:8080`);
 
         websocket.onmessage = (event) => {
             const data = JSON.parse(event.data);
diff --git a/Frontend/src/components/collab/CollaborationSpace.jsx b/Frontend/src/components/collab/CollaborationSpace.jsx
@@ -104,7 +104,8 @@ const CollaborationSpace = () => {
     const initiateWebSocket = (username) => {
         if (websocketRef.current) return; // Prevent duplicate connections
 
-        const websocket = new WebSocket("ws://localhost:3004");
+        const collabServiceHost = '35.186.151.220' || 'localhost';
+        const websocket = new WebSocket(`ws://${collabServiceHost}:3004`);
         websocketRef.current = websocket;
 
         console.log("In initiate websocket, the username is", username);
@@ -160,7 +161,7 @@ const CollaborationSpace = () => {
         setYDoc(doc);
 
         // create websocket provider to synchronize the document
-        const wsProvider = new WebsocketProvider("ws://localhost:1234", roomId, doc);
+        const wsProvider = new WebsocketProvider(`ws://${collabServiceHost}:1234`, roomId, doc);
         setProvider(wsProvider);
 
         // Create a shared type in Yjs for collaborative code editing
diff --git a/Frontend/src/services/categories.js b/Frontend/src/services/categories.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const baseCategoryUrl = 'http://localhost:3001/api/categories';
+const baseCategoryUrl = 'http://34.120.84.41/api/categories';
 
 export const getAllCategories = async () => {
     console.log("getAllCategories func called")
diff --git a/Frontend/src/services/history.js b/Frontend/src/services/history.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const baseUrl = 'http://localhost:3005/api/histories';
+const baseUrl = 'http://34.120.84.41/api/histories';
 
 // Fetch all attempt history for a user by their object ID
 const getHistoryByUserId = (userId) => {
diff --git a/Frontend/src/services/questions.js b/Frontend/src/services/questions.js
@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-const baseUrl = 'http://localhost:3001/api/questions'
+const baseUrl = 'http://34.120.84.41/api/questions'
 
 const getAll = () => {
     const request = axios.get(baseUrl);
diff --git a/Frontend/src/services/users.js b/Frontend/src/services/users.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const baseUrl = 'http://localhost:3002';
+const baseUrl = 'http://34.120.84.41';
 const auth = "auth"
 const user = "users"
 
diff --git a/yaml-of-yamls.yaml b/yaml-of-yamls.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:20`
	`1`	`+FROM node:18-alpine`
`2`	`2`
`3`	`3`	`WORKDIR /app`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function setUpYjsSocket() {`
`19`	`19`	`});`
`20`	`20`
`21`	`21`	`server.listen(1234, () => {`
`22`		`- console.log('Websocket server is listening on ws://localhost:1234')`
	`22`	`+ console.log('Websocket server is listening on ws://external-ip:1234')`
`23`	`23`	`})`
`24`	`24`	`}`
`25`	`25`