From b85d4397944ca4798b805c717798100d8d6fbbaa Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Tue, 9 Jun 2026 15:42:45 +0900
Subject: [PATCH] =?UTF-8?q?ci=20-=20tomcat=20=EB=A7=8C=20jdk17=20=EB=A1=9C?=
 =?UTF-8?q?=20=EC=8B=A4=ED=96=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 빌드는 jdk8, 톰캣 startup/shutdown 만 jdk17
- JAVA_HOME_TOMCAT 환경변수로 분리
---
 .gitea/workflows/eapim-portal-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml
index ab75518..3bcdcb3 100644
--- a/.gitea/workflows/eapim-portal-ci.yml
+++ b/.gitea/workflows/eapim-portal-ci.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: [self-hosted, linux, eapim-portal]
     env:
       JAVA_HOME: /apps/opts/jdk8
+      JAVA_HOME_TOMCAT: /apps/opts/jdk17
       CATALINA_BASE: /prod/devportal
       CATALINA_HOME: /prod/apache-tomcat-9.0.116
       CATALINA_PID: /prod/devportal/temp/catalina.pid
@@ -63,7 +64,7 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: |
           if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then
-            "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
+            JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
             for i in $(seq 1 30); do
               [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break
               sleep 1
@@ -87,7 +88,7 @@ jobs:
           [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
 
           mkdir -p "$(dirname $CATALINA_PID)"
-          "$CATALINA_HOME/bin/startup.sh"
+          JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/startup.sh"
 
           DEADLINE=$(($(date +%s) + 90))
           STATUS=000
@@ -119,7 +120,7 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: |
           if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then
-            "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
+            JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
             for i in $(seq 1 30); do
               [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break
               sleep 1