Merge branch 'master' into api-gateway

cheehongw · cheehongw · commit 9132a02e805c · 2023-11-15T01:10:29.000+08:00
diff --git a/.github/workflows/build_push_registry.yml b/.github/workflows/build_push_registry.yml
@@ -13,7 +13,7 @@ jobs:
   build-push-artifact:
     runs-on: ubuntu-latest
     outputs:
-      build_status: ${{ steps.set_output.outputs.build_status }}
+      should_deploy: ${{ steps.deploy.outputs.BUILD_STEP_RAN }}
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v3"
@@ -33,6 +33,9 @@ jobs:
               - 'matching_service/**'
             collab_service:
               - 'collab_service/**'
+            code_execution:
+              - 'code_execution/**'
+            
               
       - name: 'Create env file'
         run: |
@@ -54,41 +57,82 @@ jobs:
         run: |-
           gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev --quiet
 
-      - name: Determine Build Status
-        id: set_output
-        run: echo "::set-output name=build_status::false"
-
       - name: 1. Build and Push frontend
+        id: a
         if: steps.changes.outputs.frontend == 'true'
         run: |
           docker-compose build frontend
           docker-compose push frontend
-          echo "::set-output name=build_status::true"
 
       - name: 2. Build and Push question-service
+        id: b
         if: steps.changes.outputs.question_service == 'true'
         run: |
           docker-compose build question-service
           docker-compose push question-service
-          echo "::set-output name=build_status::true"
 
       - name: 3. Build and Push user-service
+        id: c
         if: steps.changes.outputs.user_service == 'true'
         run: |
           docker-compose build user-service
           docker-compose push user-service
-          echo "::set-output name=build_status::true"
 
       - name: 4. Build and Push matching-service
+        id: d
         if: steps.changes.outputs.matching_service == 'true'
         run: |
           docker-compose build matching-service
           docker-compose push matching-service
-          echo "::set-output name=build_status::true"
 
       - name: 5. Build and Push collab-service
+        id: e
         if: steps.changes.outputs.collab_service == 'true'
         run: |
           docker-compose build collab-service
           docker-compose push collab-service
-          echo "::set-output name=build_status::true"
+
+      - name: 6. Build and Push code-execution
+        id: f
+        if: steps.changes.outputs.code_execution == 'true'
+        run: |
+          docker-compose build code-execution
+          docker-compose push code-execution
+
+      - name: determine deploy step
+        id: deploy
+        if: ${{ steps.a.conclusion == 'success' || steps.b.conclusion == 'success' || steps.c.conclusion == 'success' || steps.d.conclusion == 'success'  || steps.e.conclusion == 'success' || steps.f.conclusion == 'success' }}
+        run: |
+          echo "BUILD_STEP_RAN=true" >> $GITHUB_OUTPUT
+
+
+  deploy:
+    needs: build-push-artifact
+    if: ${{needs.build-push-artifact.outputs.should_deploy== 'true'}}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: "Set up google auth"
+        id: auth
+        uses: "google-github-actions/auth@v1"
+        with:
+          credentials_json: "${{ secrets.SERVICE_ACCOUNT_KEY }}"
+
+      - name: "Use gcloud CLI"
+        run: "gcloud info"
+
+      - name: "SSH to VM"
+        id: 'compute-ssh'
+        uses: 'google-github-actions/ssh-compute@v0'
+        with:
+          instance_name: 'peerprep-prod'
+          zone: 'asia-southeast1-b'
+          ssh_private_key: '${{ secrets.SSH_KEY }}'
+          command: 'echo "${{ secrets.ENV_FILE }}" | sudo tee /usr/src/peerprep/.env > /dev/null && sudo chmod 777 /usr/src/peerprep/scripts/init.sh && sudo /usr/src/peerprep/scripts/init.sh'
+
+      - id: 'test'
+        run: |-
+          echo '${{ steps.compute-ssh.outputs.stdout }}'
+          echo '${{ steps.compute-ssh.outputs.stderr }}'
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -3,16 +3,13 @@ name: Deployment Workflow
 on:
     workflow_dispatch:
     workflow_run:
-      workflows: ["Selectively Build and Push to Artifact Registry", "Build and Push to Artifact Registry"]
+      workflows: ["Build and Push to Artifact Registry"]
       types:
         - completed
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    if: >
-      github.event_name == 'workflow_dispatch' || 
-      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.outputs.build_status == 'true')
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/code_execution/Dockerfile.prod b/code_execution/Dockerfile.prod
@@ -0,0 +1,18 @@
+# Stage 1: Build the application
+FROM node:18-alpine AS builder
+
+WORKDIR /app
+COPY package*.json ./
+RUN npm ci
+COPY . .
+RUN npm run build
+
+# Stage 2: Setup the production environment
+FROM node:18-alpine
+WORKDIR /usr/src/app
+COPY package*.json ./
+RUN npm ci --only=production
+COPY --from=builder /app/dist ./dist
+
+# Command to run the application
+CMD ["npm", "run", "serve"]
diff --git a/code_execution/package.json b/code_execution/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "ts-node src/index.ts",
-    "build": "tsc --init"
+    "build": "tsc",
+    "serve": "node dist/index.js"
   },
   "keywords": [],
   "author": "",
diff --git a/code_execution/tsconfig.json b/code_execution/tsconfig.json
@@ -55,7 +55,7 @@
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
diff --git a/collab_service/.dockerignore b/collab_service/.dockerignore
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -86,6 +86,50 @@ services:
     ports:
       - "8082:8082"
 
+  code-execution:
+    container_name: code-execution
+    image: asia-southeast1-docker.pkg.dev/cs3219-400714/peerprep/code-execution:latest
+    build: 
+      context: ./code_execution
+      dockerfile: Dockerfile.prod
+    environment:
+      - PORT=8090
+      - JUDGE0_API_KEY=${JUDGE0_API_KEY}
+    ports:
+      - "8090:8090"
+    volumes:
+      - questions_test_cases:/app/question_test_cases
+
+  judge0-server:
+      image: judge0/judge0:1.13.0
+      ports:
+        - "2358:2358"
+      privileged: true
+      environment:
+        REDIS_PASSWORD: ${REDIS_PASSWORD}
+        POSTGRES_HOST: postgres
+        POSTGRES_USER: ${POSTGRES_USER}
+        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        POSTGRES_DB: judge0
+        POSTGRES_PORT: ${PG_PORT}
+
+      env_file:
+        - config_env/config-judge0.env
+
+  judge0-workers:
+    image: judge0/judge0:1.13.0
+    command: ["./scripts/workers"]
+    privileged: true
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      POSTGRES_HOST: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: judge0
+      POSTGRES_PORT: ${PG_PORT}
+    env_file:
+      - config_env/config-judge0.env
+
   mongo:
     container_name: mongo
     image: mongo:6.0
@@ -124,6 +168,18 @@ services:
       retries: 5
       start_period: 30s
 
+  redis:
+    container_name: redis
+    image: redis:7
+    ports:
+      - "6379:6379"
+    command: [
+      "bash", "-c",
+      'docker-entrypoint.sh --appendonly yes --requirepass "$$REDIS_PASSWORD"'
+    ]
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+
 volumes:
   postgres_data:
   mongo-dev-data:
diff --git a/docker_compose_dev.yml b/docker_compose_dev.yml
@@ -77,7 +77,6 @@ services:
       - "8083:8083"
 
   # judge0-server:
-  #   container_name: judge0-server
   #   image: judge0/judge0:1.13.0
   #   ports:
   #     - "2358:2358"
@@ -144,17 +143,17 @@ services:
       retries: 5
       start_period: 30s
 
-  # redis:
-  #   container_name: redis
-  #   image: redis:7
-  #   ports:
-  #     - "6379:6379"
-  #   command: [
-  #     "bash", "-c",
-  #     'docker-entrypoint.sh --appendonly yes --requirepass "$$REDIS_PASSWORD"'
-  #   ]
-  #   environment:
-  #     REDIS_PASSWORD: ${REDIS_PASSWORD}
+  redis:
+    container_name: redis
+    image: redis:7
+    ports:
+      - "6379:6379"
+    command: [
+      "bash", "-c",
+      'docker-entrypoint.sh --appendonly yes --requirepass "$$REDIS_PASSWORD"'
+    ]
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
 
 
 volumes:
diff --git a/frontend/src/components/ChatBox/ChatBox.component.tsx b/frontend/src/components/ChatBox/ChatBox.component.tsx
@@ -75,6 +75,7 @@ const ChatBox = () => {
             {entry.nickname !== user?.username && (
               <Avatar
                 name={entry.nickname}
+                src={entry.avatar}
                 w="40px"
                 h="40px"
                 alignSelf="flex-start"
@@ -99,6 +100,7 @@ const ChatBox = () => {
             {entry.nickname === user?.username && (
               <Avatar
                 name={entry.nickname}
+                src={entry.avatar}
                 w="40px"
                 h="40px"
                 alignSelf="flex-start"
diff --git a/frontend/src/contexts/sharededitor.context.tsx b/frontend/src/contexts/sharededitor.context.tsx
@@ -19,6 +19,7 @@ import data from "../data/lang_temps.json";
 import { ToastId, useToast } from "@chakra-ui/react";
 import { wsCollabUrl } from "../api/gateway";
 import { getExecutionResult, submitCodeForExecution } from "../api/code";
+import { getProfilePicUrl } from "../api/user";
 
 export type language = keyof typeof data;
 
@@ -28,6 +29,7 @@ export const LangDataMap = data;
 export type chatRecord = {
   nickname: string;
   msg: string;
+  avatar?: string;
 };
 
 type executionResult =
@@ -143,6 +145,8 @@ export const SharedEditorProvider = ({
   const _submissions = useRef<Y.Array<any> | undefined>();
   const _poll_interval = useRef<NodeJS.Timeout | undefined>();
 
+  const myAvatar = getProfilePicUrl(user.profilePic);
+
   const submitToServer = async (submission: submissionRecord) => {
     // curr submission and currsubmission in state should alr be submitted
     console.log("submitting answer to server");
@@ -183,6 +187,7 @@ export const SharedEditorProvider = ({
       {
         msg: s,
         nickname: user.username,
+        avatar: myAvatar,
       },
     ]);
     setChat(_chat.toArray());
