Merge branch 'dev/user-profile' into dev/seonghyeon

Author: st42597

.DS_Store

@@ -1,13 +1,20 @@
-FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04
+# [Choice] Python version (https://github.com/microsoft/vscode-dev-containers/tree/main/containers/python-3)
+ARG VARIANT=3.8-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT}
 
-# Install Node 16
-ENV NODE_VERSION=16
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \
-    && bash -c ". $HOME/.nvm/nvm.sh \
-    && nvm install $NODE_VERSION \
-    && nvm alias default $NODE_VERSION \
-    && npm install -g typescript yarn"
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="16"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
-# Install packages from apt
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends vim python3-pip python3-setuptools
+RUN apt-get update && \
+    export DEBIAN_FRONTEND=noninteractive && \
+    apt-get -y install --no-install-recommends \
+        libgtk2.0-0 \
+        libgtk-3-0 \
+        libgbm-dev \
+        libnotify-dev \
+        libgconf-2-4 \
+        libnss3 \
+        libxss1 \
+        libasound2 \
+        libxtst6 xauth xvfb

.devcontainer/Dockerfile

@@ -3,6 +3,7 @@
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspace",
+  "forwardPorts": [10000],
 
   "postCreateCommand": "./.devcontainer/postCreateCommand.sh",
 
@@ -14,10 +15,14 @@
     "editorconfig.editorconfig",
     "gruntfuggly.todo-tree",
     "johnsoncodehk.volar",
+    "mhutchie.git-graph",
     "ms-python.python",
     "naumovs.color-highlight",
     "oderwat.indent-rainbow",
     "pkief.material-icon-theme",
     "rangav.vscode-thunder-client"
-  ]
+  ],
+
+  // Connect as non-root user (https://code.visualstudio.com/remote/advancedcontainers/add-nonroot-user)
+  "remoteUser": "vscode"
 }

.devcontainer/devcontainer.json

@@ -14,7 +14,13 @@ services:
       - DISABLE_HEARTBEAT=1
       - JUDGE_SERVER_URL=http://judge-server-dev:8080
       - JUDGE_SERVER_TOKEN=CHANGE_THIS
-
+      - DISPLAY=:14
+      - LIBGL_ALWAYS_INDIRECT=0
+      - CYPRESS_BASE_URL=http://localhost:8080
+    volumes_from:
+      - x11-bridge:rw
+    depends_on:
+      - x11-bridge
   judge-server-dev:
     image: skkunpc/judge-server
     container_name: judge-server-dev
@@ -31,8 +37,7 @@ services:
       - /tmp
     volumes:
       - ../backend/data/test_case:/test_case:ro
-      - ./judge-server/log:/log
-      - ./judge-server/run:/judger
+      - judger-data:/judger
     environment:
       - DISABLE_HEARTBEAT=1
       - TOKEN=CHANGE_THIS
@@ -53,6 +58,21 @@ services:
     volumes:
       - redis-data:/data
 
+  x11-bridge:
+    image: jare/x11-bridge
+    volumes:
+      - "/tmp/.X11-unix:/tmp/.X11-unix:rw"
+    ports:
+      - "10000:10000"
+    restart: always
+    environment:
+      - MODE=tcp
+      - XPRA_HTML=yes
+      - DISPLAY=:14
+      - XPRA_TCP_PORT=10000
+      - XPRA_PASSWORD=CHANGE_THIS
+
 volumes:
   postgres-data: null
   redis-data: null
+  judger-data: null

.devcontainer/docker-compose.yml

@@ -35,3 +35,4 @@ SysOptions.judge_server_token='$JUDGE_SERVER_TOKEN'
 
 # Install Node packages
 yarn --cwd /workspace/frontend install
+yarn --cwd /workspace/frontend cypress install

.devcontainer/postCreateCommand.sh

@@ -9,3 +9,6 @@ indent_size = 2
 
 [*.{py,sh,conf}]
 indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.editorconfig

@@ -6,8 +6,8 @@ on:
       - master
 
 jobs:
-  build-image:
-    runs-on: ubuntu-18.04
+  build:
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout to repository
@@ -20,11 +20,11 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: dotoleeoak
-          password: ${{ secrets.CR_PAT }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push container image
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: ghcr.io/skku-npc/coding-platform:latest
+          tags: ghcr.io/skkuding/coding-platform:latest

.github/workflows/build-image.yml renamed to .github/workflows/build.yml

@@ -5,7 +5,8 @@ on:
   # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
     paths:
-      - 'backend/**'
+      - "backend/**"
+      - ".github/workflows/test-backend.yml"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -22,8 +23,8 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7.10' # using SemVer's version range syntax
-          architecture: 'x64'
+          python-version: "3.8.10" # using SemVer's version range syntax
+          architecture: "x64"
 
       - uses: actions/cache@v2
         with:

.github/workflows/test-backend.yml

@@ -6,14 +6,15 @@ on:
   pull_request:
     paths:
       - "frontend/**"
+      - ".github/workflows/test-frontend.yml"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   test:
-    runs-on: ubuntu-18.04 
+    runs-on: ubuntu-18.04
     env:
       working-directory: ./frontend
 
@@ -22,7 +23,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: "14"
 
       - name: Cache Node modules
         id: cache-yarn
@@ -43,7 +44,7 @@ jobs:
       - name: Check styles
         working-directory: ${{ env.working-directory }}
         run: yarn lint --no-fix
-      
+
       - name: Build production files
         working-directory: ${{ env.working-directory }}
         run: yarn build

.github/workflows/test-frontend.yml

@@ -196,3 +196,6 @@ typings/
 
 # devcontainer
 .devcontainer/data
+
+# MacOS file
+.DS_Store