From 7351a95f80ad98bcb2bc39b9ef54c1150886d722 Mon Sep 17 00:00:00 2001
From: dykim <gomdobi@gmail.com>
Date: Fri, 5 Dec 2025 13:44:28 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=8F=99=20=EA=B6=8C=ED=95=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8096ee8..fe657fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache curl && \
       https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OTEL_VERSION}/opentelemetry-javaagent.jar \
       -o /opentelemetry-javaagent.jar
 
-# 2단계: Tomcat + JDK 8 이미지
+# 2단계: Tomcat 이미지 (Java 8 기준, Java 17 쓸 거면 jdk17-temurin 그대로 사용)
 FROM tomcat:9.0-jdk8-temurin
 
 ENV TZ=Asia/Seoul \
@@ -17,24 +17,18 @@ ENV TZ=Asia/Seoul \
     OTEL_RESOURCE_ATTRIBUTES="deployment.environment=prod" \
     JAVA_TOOL_OPTIONS="-javaagent:/opt/opentelemetry-javaagent.jar"
 
-# 타임존 적용
+# 타임존 설정
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
 
 # OTEL 에이전트 복사
 COPY --from=otel /opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
 
-# 톰캣 기본 웹앱 제거 + 필요한 디렉터리 선 생성
-RUN rm -rf /usr/local/tomcat/webapps/* && \
-    mkdir -p /usr/local/tomcat/webapps/ROOT && \
-    mkdir -p /usr/local/tomcat/conf/Catalina/localhost
+# 기본 ROOT 앱 제거
+RUN rm -rf /usr/local/tomcat/webapps/*
 
-# Maven 빌드 결과 WAR를 임시 위치에 복사
-COPY target/sayit-helpdesk.war /tmp/sayit-helpdesk.war
-
-# WAR를 ROOT 디렉터리로 풀어서 배포
-RUN cd /usr/local/tomcat/webapps/ROOT && \
-    "$JAVA_HOME/bin/jar" xf /tmp/sayit-helpdesk.war && \
-    rm /tmp/sayit-helpdesk.war
+# Maven 빌드된 WAR 복사
+# Maven 빌드 결과 파일명에 맞게 수정
+COPY target/sayit-helpdesk.war /usr/local/tomcat/webapps/ROOT.war
 
 EXPOSE 8080
-CMD ["catalina.sh", "run"]
\ No newline at end of file
+CMD ["catalina.sh","run"]
\ No newline at end of file