Merge pull request #10 from DMU-DebugVisual/refactor/dirs_and_version

Refactor: aws 서버 디렉토리명 변경으로 인한 수정, fix: Dockerfile 베이스 이미지 EOL(지원 종료) 문제 해결

Author: 1anminJ

.gitignore

@@ -1,4 +1,5 @@
 # 컴파일러 임시 파일들
 server/code/*
 !server/code/.gitkeep
+.github/*
 .env

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.9-slim-bookworm
 
 WORKDIR /usr/src/app
 

docker-compose.yml

@@ -1,23 +1,69 @@
+# 서버 루트 파일에 들어가 있는 docker-compose.yml
+# flask-server 컨테이너에 들어가있는 거 X
+
 services:
   backend:
-    build: .
+    build:
+      context: ./Zivorp_Backend
+      dockerfile: Dockerfile
+    container_name: spring-backend
+    working_dir: /app
     ports:
       - "8080:8080"
+    networks:
+      - debug-net
     depends_on:
       - flask
-    environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/debugdb
-      SPRING_DATASOURCE_USERNAME: root
-      SPRING_DATASOURCE_PASSWORD: hmjeoung33
 
   flask:
     build:
-      context: ./flask  # Flask Dockerfile 위치
-    container_name: python-compiler
+      context: ./Zivorp_Spike
+      dockerfile: Dockerfile
+    container_name: flask-server
     ports:
       - "5050:5050"
+    volumes:
+      - /home/ec2-user/Zivorp_Spike/server/code:/usr/src/app/code
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - debug-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+    environment:
+      - PYTHONIOENCODING=utf-8
+      - LANG=C.UTF-8
+      - LC_ALL=C.UTF-8
+    env_file:
+      - ./Zivorp_Spike/.env
 
-  db:
-    image: mysql:8.0
-    ports:
-      - "3306:3306"
+  python-compiler:
+    build:
+      context: ./Zivorp_Spike/docker/python
+    image: python-compiler
+    container_name: python-compiler
+    entrypoint: [ "echo", "python-compiler image build only" ]
+    networks:
+      - debug-net
+
+  c-compiler:
+    build:
+      context: ./Zivorp_Spike/docker/c
+    image: c-compiler
+    container_name: c-compiler
+    entrypoint: [ "echo", "c-compiler image build only" ]
+    networks:
+      - debug-net
+
+  java-compiler:
+    build:
+      context: ./Zivorp_Spike/docker/java
+    image: java-compiler
+    container_name: java-compiler
+    entrypoint: [ "echo", "java-compiler image build only" ]
+    networks:
+      - debug-net
+
+networks:
+  debug-net:
+    driver: bridge

docker/c/entrypoint.sh

@@ -30,4 +30,4 @@ cat runtime_error.txt || echo "⚠️ runtime_error.txt 없음"
 echo
 
 rm -f program output.txt compile_error.txt runtime_error.txt
-exit $status
+exit $status

docker/java/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17
+FROM openjdk:17-jdk-slim
 WORKDIR /usr/src/app
 
 COPY entrypoint.sh /usr/src/app/entrypoint.sh

docker/java/entrypoint.sh

@@ -30,4 +30,4 @@ cat runtime_error.txt || echo "⚠️ runtime_error.txt 없음"
 echo
 
 rm -f Main.class output.txt compile_error.txt runtime_error.txt
-exit $status
+exit $status

docker/python/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.11-slim
+FROM python:3.9-slim-bookworm
 
 WORKDIR /usr/src/app
 
 COPY entrypoint.sh /usr/src/app/entrypoint.sh
 
 RUN chmod +x /usr/src/app/entrypoint.sh
 
-CMD ["bash", "/usr/src/app/entrypoint.sh"]
+CMD ["bash", "/usr/src/app/entrypoint.sh"]

server/app.py

@@ -57,7 +57,7 @@ def echo():
 
 # 공통 코드 실행 함수
 def execute_code(code, input_data, lang):
-    base_dir = '/home/ec2-user/DebugVisual_Spike/server/code'
+    base_dir = '/home/ec2-user/Zivorp_Spike/server/code'
     flask_dir = '/usr/src/app/code'
     os.makedirs(base_dir, exist_ok=True)