Merge pull request #384 from JNU-econovation/feat/#383

[BE/feat] AI 서버 분리로 인한 MariaDB 서버 구축 및 EC2 사양 변경
JNU-econovation · Jul 16, 2024 · d76d45b · d76d45b
2 parents 29c32ff + 9808bc9
commit d76d45b
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 8 deletions.
diff --git a/.github/workflows/testAndDeploy.yml → .github/workflows/devWorkflow.yml b/.github/workflows/testAndDeploy.yml → .github/workflows/devWorkflow.yml
diff --git a/.github/workflows/prodWorkflow.yml b/.github/workflows/prodWorkflow.yml
@@ -0,0 +1,109 @@
+name: testAndDeploy
+
+on:
+  pull_request:
+    branches:
+      - release
+      - main
+    types:
+      - closed
+
+defaults:
+  run:
+    working-directory: ./BE/exceed
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Cache Gradle
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: Jacoco Report to PR
+        id: jacoco
+        uses: madrapps/[email protected]
+        with:
+          paths: ${{ github.workspace }}/**/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Send docker-compose.yml
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          source: ./BE/exceed/docker-compose-prod.yml
+          target: /home/ubuntu/backend-deploy
+
+      - name: Send resources-develop-environment
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          source: ./BE/exceed/resources/gaebaljip-prod-environment
+          target: /home/ubuntu/backend-deploy
+
+      - name: Create .env.prod file
+        run: |
+          echo "${{ secrets.ENV_PROD_VARS }}" > .env.prod
+
+      - name: Send env file
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          source: ./BE/exceed/.env.prod
+          target: /home/ubuntu/backend-deploy
+
+      - name: Docker Image Build
+        run: docker build -f Dockerfile-prod -t ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-prod:latest .
+
+      - name: Docker Hub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER_NAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: docker Hub Push
+        run: docker push ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-prod:latest
+
+      - name: SSH Deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            cd backend-deploy/BE/exceed
+            sudo docker-compose down
+            sudo docker pull ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-prod:latest
+            sudo docker-compose up --build -d
+            sudo docker image prune -a -f
+            
+            
diff --git a/BE/exceed/.gitignore b/BE/exceed/.gitignore
@@ -45,8 +45,7 @@ src/main/resources/static/docs/api-doc.html
 
 ### env
 .env
-env-dev
-
+.env.prod
 
 ### jmh
 

diff --git a/BE/exceed/Dockerfile b/BE/exceed/Dockerfile
@@ -15,4 +15,4 @@ COPY ./food_data.csv ./food_data.csv
 EXPOSE 8080
 
 # CMD 명령어에서 CSV 파일의 위치를 절대 경로로 지정
-CMD ["java", "-jar", "-Dspring.profiles.active=dev", "eatceed.jar", "./food_data.csv"]
+CMD ["java", "-jar", "-Dspring.profiles.active=dev", "eatceed.jar", "./food_data.csv"]
diff --git a/BE/exceed/Dockerfile-prod b/BE/exceed/Dockerfile-prod
@@ -0,0 +1,18 @@
+FROM openjdk:17-oracle
+
+ENV TZ=Asia/Seoul
+
+# 앱을 위한 작업 디렉토리 설정
+WORKDIR /app
+
+# JAR 파일 복사
+ARG JAR_FILE="./build/libs/*.jar"
+COPY ${JAR_FILE} eatceed.jar
+
+# CSV 파일 복사
+COPY ./food_data.csv ./food_data.csv
+
+EXPOSE 8080
+
+# CMD 명령어에서 CSV 파일의 위치를 절대 경로로 지정
+CMD ["java", "-jar", "-Dspring.profiles.active=prod", "eatceed.jar", "./food_data.csv"]
diff --git a/BE/exceed/build.gradle b/BE/exceed/build.gradle
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = 'com.gaebaljip'
-version = '0.0.1-SNAPSHOT'
+version = '1.0.0'
 
 java {
 	sourceCompatibility = '17'

diff --git a/BE/exceed/docker-compose-prod.yml b/BE/exceed/docker-compose-prod.yml
@@ -0,0 +1,76 @@
+version: '3'
+services:
+  eatceed-redis:
+    image: redis:alpine
+    container_name: gaebaljip-redis
+    command: redis-server --port 6379
+    expose:
+      - "6379"
+    networks:
+      - gaebaljip-network
+
+  eatceed-backend:
+    image: hwangdaesun/gaebaljip-prod:latest
+    container_name: gaebaljip-spring
+    ports:
+      - 8080:8080
+    depends_on:
+      - eatceed-redis
+    environment:
+      - RDS_DATABASE_ENDPOINT=${RDS_DATABASE_ENDPOINT}
+      - RDS_PORT=${RDS_PORT}
+      - RDS_DB_NAME=${RDS_DB_NAME}
+      - RDS_DATABASE_USERNAME=${RDS_DATABASE_USERNAME}
+      - RDS_DATABASE_PASSWORD=${RDS_DATABASE_PASSWORD}
+      - S3_BUCKET_NAME=${S3_BUCKET_NAME}
+      - CLOUD_AWS_ACCESS_KEY=${CLOUD_AWS_ACCESS_KEY}
+      - CLOUD_AWS_SECRET_KEY=${CLOUD_AWS_SECRET_KEY}
+      - JWT_SECRET=${JWT_SECRET}
+      - SES_MAIL_ADDRESS=${SES_MAIL_ADDRESS}
+      - ENCRYPTION_SPEC=${ENCRYPTION_SPEC}
+      - ENCRYPTION_SECRET=${ENCRYPTION_SECRET}
+      - ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM}
+      - SPRING_REDIS_HOST=gaebaljip-redis
+      - SPRING_REDIS_PORT=6379
+    networks:
+      - gaebaljip-network
+    restart:  "always"
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    restart: "always"
+    ports:
+      - "3000:3000"
+    volumes:
+      - grafana-data:/var/lib/grafana
+      - ./resources/gaebaljip-prod-environment/grafana/provisioning/:/etc/grafana/provisioning/
+    environment:
+      - GF_SERVER_ROOT_URL=localhost:3000
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+    depends_on:
+      - prometheus
+    networks:
+      - gaebaljip-network
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    restart: "always"
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./resources/gaebaljip-prod-environment/prometheus/config:/etc/prometheus/
+      - prometheus-data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+    networks:
+      - gaebaljip-network
+
+volumes:
+  grafana-data:
+  prometheus-data:
+
+networks:
+  gaebaljip-network:
diff --git a/BE/exceed/resources/gaebaljip-prod-environment/prometheus/config/prometheus.yml b/BE/exceed/resources/gaebaljip-prod-environment/prometheus/config/prometheus.yml
@@ -0,0 +1,19 @@
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+alerting:
+  alertmanagers:
+    - static_configs:
+        - targets:
+          # - alertmanager:9093
+rule_files:
+scrape_configs:
+  - job_name: "prometheus"
+    static_configs:
+      - targets: ["localhost:9090"]
+    #추가
+  - job_name: "spring-actuator"
+    metrics_path: '/actuator/prometheus'
+    scrape_interval: 1s
+    static_configs:
+      - targets: ['3.37.117.77:8080']
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/common/data/MariaDBAutoComplete.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/common/data/MariaDBAutoComplete.java
@@ -7,6 +7,7 @@
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import com.gaebaljip.exceed.adapter.out.jpa.food.FoodEntity;
@@ -22,6 +23,7 @@
 @Log4j2
 @RequiredArgsConstructor
 @ConditionalOnExpression("${ableAutoComplete:true}")
+@Profile("!prod")
 public class MariaDBAutoComplete implements ApplicationRunner {
 
     private final FoodPort foodPort;

diff --git a/BE/exceed/src/main/resources/application-prod.yml b/BE/exceed/src/main/resources/application-prod.yml
@@ -4,14 +4,20 @@ spring:
     driver-class-name: org.mariadb.jdbc.Driver
     username: ${RDS_DATABASE_USERNAME}
     password: ${RDS_DATABASE_PASSWORD}
+  redis:
+    host: ${SPRING_REDIS_HOST}
+    port: ${SPRING_REDIS_PORT}
   jpa:
     hibernate:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
       dialect: org.hibernate.dialect.MariaDBDialect
-      ddl-auto: none
-    show-sql: true
-    defer-datasource-initialization: true
+      ddl-auto: validate
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+        use_sql_comments: true
 cloud:
   aws:
     credentials:
@@ -32,12 +38,71 @@ encryption:
 jwt:
   secret: ${JWT_SECRET}
 
+exceed:
+  url : https://eatceed.net
+
+springdoc:
+  api-docs:
+    path: /api-docs # API 문서 생성 경로
+    groups:
+      enabled: true
+  swagger-ui:
+    path: /index.html # Swagger-ui 경로
+    enabled: true
+    groups-order: asc
+    tags-sorter: alpha
+    operations-sorter: alpha
+    display-request-duration: true
+    doc-expansion: none
+  cache:
+    disabled: true
+  override-with-generic-response: false
+  model-and-view-allowed: true
+  default-consumes-media-type: application/json
+  default-produces-media-type: application/json
+
 ableAutoComplete: true
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+        exclude: "env, beans"
+
 logging:
   level:
     org:
       hibernate:
         type:
           descriptor:
-            sql: trace
+            sql: trace
+
+org:
+  quartz:
+    scheduler:
+      instanceName: gaebaljip
+      instanceId: AUTO
+      rmi:
+        export: false
+        proxy: false
+    threadPool:
+      class: org.quartz.simpl.SimpleThreadPool
+      threadCount: 5
+    context:
+      key:
+        QuartzTopic: QuartzPorperties
+    jobStore:
+      class: org.quartz.impl.jdbcjobstore.JobStoreTX
+      driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+      tablePrefix: QRTZ_
+      isClustered: true
+      dataSource: gaebaljip
+    dataSource:
+      gaebaljip:
+        provider: hikaricp
+        driver: org.mariadb.jdbc.Driver
+        URL: jdbc:mariadb://${RDS_DATABASE_ENDPOINT}:${RDS_PORT}/${RDS_DB_NAME}?serverTimezone=Asia/Seoul
+        user: ${RDS_DATABASE_USERNAME}
+        password: ${RDS_DATABASE_PASSWORD}
+        maxConnections: 30
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,8 +45,7 @@ src/main/resources/static/docs/api-doc.html @@
     ### env
     .env
-    env-dev
+    .env.prod
     ### jmh
@@ Expand Down @@