fix: 도커서버 ts 대신 js 쓰도록 변경

boostcampwm2023 · Dec 5, 2023 · 4cdcc91 · 4cdcc91
1 parent 5f82e9f
commit 4cdcc91
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/be/algo-with-me-docker/.dockerignore b/be/algo-with-me-docker/.dockerignore
@@ -1,5 +1,5 @@
 node-modules/
-src/
+dist/
 build.sh
 .eslintrc.js
 .prettierrc

diff --git a/be/algo-with-me-docker/Dockerfile b/be/algo-with-me-docker/Dockerfile
@@ -21,4 +21,4 @@ SHELL ["/bin/bash", "-ec"]
 
 EXPOSE ${PORT}
 
-CMD node dist/app.js
+CMD node src/app.js
diff --git a/be/algo-with-me-docker/node-sh/run.sh b/be/algo-with-me-docker/node-sh/run.sh
@@ -16,16 +16,16 @@ MEMORY_FILE="/algo-with-me/submissions/$1/$2/$3.$4.memory"
 # 제출된 js 파일이 있으면 node로 js 파일 실행
 # 주의: judge.sh와 run.sh는 execute 권한이 부여되어야 함
 if [ -f "$SUBMISSION_JS_FILE" ]; then
-  echo "[algo-with-me] run.sh: started running $SUBMISSION_JS_FILE. COMPETITION_ID=$1, USER_ID=$2, PROBLEM_ID=$3, TESTCASE_ID=$4"
+  echo "[algo-with-me-docker] run.sh: started running $SUBMISSION_JS_FILE. COMPETITION_ID=$1, USER_ID=$2, PROBLEM_ID=$3, TESTCASE_ID=$4"
   # -o FILE Write result to FILE
   # -f FMT  Custom format
   #   U      Total number of CPU-seconds that the process used directly (in user mode), in seconds.
   #   e      Elapsed real (wall clock) time used by the process, in seconds.
   #   M      Maximum resident set size of the process during its lifetime, in Kilobytes.
   /algo-with-me/node-sh/time -o "$MEMORY_FILE" -f "%M" /algo-with-me/node-sh/runJs.sh "$1" "$2" "$3" "$4" || exit 2
-  echo "[algo-with-me] run.sh: successfully ran $SUBMISSION_JS_FILE. COMPETITION_ID=$1, USER_ID=$2, PROBLEM_ID=$3, TESTCASE_ID=$4"
+  echo "[algo-with-me-docker] run.sh: successfully ran $SUBMISSION_JS_FILE. COMPETITION_ID=$1, USER_ID=$2, PROBLEM_ID=$3, TESTCASE_ID=$4"
 else
-  echo "[algo-with-me] run.sh: cannot find submitted js file $SUBMISSION_JS_FILE"
+  echo "[algo-with-me-docker] run.sh: cannot find submitted js file $SUBMISSION_JS_FILE"
   exit 3
 fi
 

diff --git a/be/algo-with-me-docker/package.json b/be/algo-with-me-docker/package.json
@@ -1,4 +1,5 @@
 {
+	"type": "commonjs",
 	"dependencies": {
 		"express": "^4.18.2"
 	},

diff --git a/be/algo-with-me-docker/src/app.ts → be/algo-with-me-docker/src/app.js b/be/algo-with-me-docker/src/app.ts → be/algo-with-me-docker/src/app.js
@@ -1,6 +1,5 @@
-import express from 'express';
-
-import child_process from 'node:child_process';
+const express = require('express');
+const child_process = require('node:child_process');
 
 const app = express();
 const PORT = 5000;