fix: FastAPI 마이그레이션 및 BellSoft JDK 환경에서의 파이썬 스크립트 실행 오류 해결 완료 (#97)

KKKK-Stempo · Jan 4, 2025 · 2f2e5a0 · 2f2e5a0
1 parent 648959e
commit 2f2e5a0
Show file tree

Hide file tree

Showing 20 changed files with 1,118 additions and 351 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -21,8 +21,10 @@ object Dependencies {
     const val owaspJavaHtmlSanitizer =
         "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:${Versions.owaspJavaHtmlSanitizer}"
     const val googleAuthenticator = "com.warrenstrange:googleauth:${Versions.googleAuthenticator}"
+    const val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:${Versions.apacheHttpClient}"
 
     // Test dependencies
     const val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test"
     const val springSecurityTest = "org.springframework.security:spring-security-test"
+    const val mockWebServer = "com.squareup.okhttp3:mockwebserver:${Versions.mockWebServer}"
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -14,4 +14,6 @@ object Versions {
     const val sonarQube = "6.0.1.5171"
     const val checkStyle = "10.20.2"
     const val jacoco = "0.8.12"
+    const val apacheHttpClient = "5.2.3"
+    const val mockWebServer = "4.12.0"
 }
diff --git a/jenkins/Dockerfile → cd/Dockerfile.core b/jenkins/Dockerfile → cd/Dockerfile.core
diff --git a/cd/Dockerfile.rhythm b/cd/Dockerfile.rhythm
@@ -0,0 +1,24 @@
+# Python 3.9 slim 베이스
+FROM python:3.9-slim
+
+# ffmpeg 설치 (pydub 라이브러리 의존성)
+RUN apt-get update \
+    && apt-get install -y ffmpeg \
+    && rm -rf /var/lib/apt/lists/*
+
+# 작업 디렉터리 지정
+WORKDIR /app
+
+# 파이썬 패키지 설치
+COPY stempo-rhythm/requirements.txt /app/
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
+
+# 소스 복사
+COPY stempo-rhythm/main.py /app/
+
+# FastAPI 서버를 위한 포트 노출
+EXPOSE 5000
+
+# Uvicorn으로 FastAPI 서버 실행
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "5000"]
diff --git a/jenkins/Jenkinsfile → cd/Jenkinsfile.core b/jenkins/Jenkinsfile → cd/Jenkinsfile.core
@@ -9,12 +9,28 @@ pipeline {
     }
 
     stages {
+        stage('Check for Python-only Changes') {
+            steps {
+                script {
+                    def changedFiles = sh(script: "git diff --name-only HEAD~1..HEAD", returnStdout: true).trim().split('\n')
+                    def hasNonPythonChange = changedFiles.any {
+                        !it.startsWith("stempo-rhythm/")
+                    }
+
+                    if (!hasNonPythonChange) {
+                        echo "Only Python code changed. Skipping pipeline."
+                        error("Aborting pipeline because only Python code changed.")
+                    }
+                }
+            }
+        }
+
         stage('Load Environment Variables') {
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
                 }
-                withCredentials([file(credentialsId: 'stempo_prod_config_yml', variable: 'CONFIG_FILE')]) {
+                withCredentials([file(credentialsId: 'stempo_prod_core_config_yml', variable: 'CONFIG_FILE')]) {
                     script {
                         loadEnvironmentVariables(env.CONFIG_FILE)
                     }
@@ -25,7 +41,7 @@ pipeline {
         stage('Configure Centralized Spring Profiles') {
             steps {
                 script {
-                    configureModuleProfile('stempo_prod_yml', env.RESOURCES_PATH, env.PROFILE_FILE_NAME)
+                    configureModuleProfile('stempo_prod_core_yml', env.RESOURCES_PATH, env.PROFILE_FILE_NAME)
                 }
             }
         }
@@ -134,7 +150,7 @@ def sendSlackBuildNotification(String message, String color) {
 
 def createSlackPayload(String message, String color, String jobUrl, String consoleOutputUrl) {
     return [
-        blocks: [
+        blocks     : [
             [
                 type: "section",
                 text: [
@@ -145,7 +161,7 @@ def createSlackPayload(String message, String color, String jobUrl, String conso
         ],
         attachments: [
             [
-                color: color,
+                color : color,
                 blocks: [
                     [
                         type: "section",
@@ -155,26 +171,26 @@ def createSlackPayload(String message, String color, String jobUrl, String conso
                         ]
                     ],
                     [
-                        type: "actions",
+                        type    : "actions",
                         elements: [
                             [
-                                type: "button",
-                                text: [
-                                    type: "plain_text",
-                                    text: "Job",
+                                type : "button",
+                                text : [
+                                    type : "plain_text",
+                                    text : "Job",
                                     emoji: true
                                 ],
-                                url: jobUrl,
+                                url  : jobUrl,
                                 value: "click_job"
                             ],
                             [
-                                type: "button",
-                                text: [
-                                    type: "plain_text",
-                                    text: "Console Output",
+                                type : "button",
+                                text : [
+                                    type : "plain_text",
+                                    text : "Console Output",
                                     emoji: true
                                 ],
-                                url: consoleOutputUrl,
+                                url  : consoleOutputUrl,
                                 value: "click_console_output"
                             ]
                         ]
@@ -212,12 +228,10 @@ def loadEnvironmentVariables(String configFile) {
 
     env.DOCKER_HUB_REPO = config.dockerhub.repo
 
-    env.HOST_CONFIG_PATH = config.host.'config-path'
-    env.HOST_CLOUD_PATH = config.host.'cloud-path'
+    env.HOST_DEFAULT_PATH = config.host.'default-path'
     env.HOST_LOGS_PATH = config.host.'logs-path'
 
-    env.CONTAINER_CONFIG_PATH = config.container.'config-path'
-    env.CONTAINER_CLOUD_PATH = config.container.'cloud-path'
+    env.CONTAINER_DEFAULT_PATH = config.container.'default-path'
     env.CONTAINER_LOGS_PATH = config.container.'logs-path'
 
     env.BLUE_CONTAINER = config.containers.blue
@@ -336,8 +350,7 @@ def deployNewInstance() {
         docker run -d --name ${env.DEPLOY_CONTAINER} \\
             -p ${env.NEW_PORT}:8080 \\
             --network ${env.APPLICATION_NETWORK} \\
-            -v ${env.HOST_CONFIG_PATH}:${env.CONTAINER_CONFIG_PATH} \\
-            -v ${env.HOST_CLOUD_PATH}:${env.CONTAINER_CLOUD_PATH} \\
+            -v ${env.HOST_DEFAULT_PATH}:${env.CONTAINER_DEFAULT_PATH} \\
             -v ${env.HOST_LOGS_PATH}:${env.CONTAINER_LOGS_PATH} \\
             -e LOG_PATH=${env.CONTAINER_LOGS_PATH} \\
             -e SPRING_PROFILES_ACTIVE=${env.PROFILE} \\
@@ -371,7 +384,7 @@ def performHealthCheck() {
         echo "Checking health... ${elapsed} seconds elapsed."
         def status = sh(
             script: """curl -s -u ${env.WHITELIST_ADMIN_USERNAME}:${env.WHITELIST_ADMIN_PASSWORD} \
-                http://${PUBLIC_IP}:${env.NEW_PORT}/actuator/health | grep 'UP'""",
+                http://${PUBLIC_IP}:${env.NEW_PORT}${env.ACTUATOR_PATH} | grep 'UP'""",
             returnStatus: true
         )
         if (status == 0) {