Merge pull request #216 from CEOS-Developers/dev

version update: dev to main

Author: limgahyun

.github/workflows/deploy_dev.yml

@@ -20,7 +20,7 @@ jobs:
         run: |
           rm -f ./src/main/resources/application-secret.yml
           touch ./src/main/resources/application-secret.yml
-          echo "${{ secrets.APPLICATION_SECRET_DEV }}" > ./src/main/resources/application-secret.yml
+          echo "${{ secrets.APPLICATION_SECRET }}" > ./src/main/resources/application-secret.yml
 
       # JDK version 설정
       - name: Set up JDK 17
@@ -62,10 +62,10 @@ jobs:
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.EC2_HOST_DEV }}
-          username: ec2-user #  ubuntu 에서 변경
+          username: ubuntu #  ubuntu 에서 변경
           key: ${{ secrets.EC2_KEY_DEV }}
           script: |
-            cd /home/ec2-user/ceos
+            cd /home/ubuntu/ceos
             
             sudo touch .env
             echo "${{ secrets.ENV_DEV }}" | sudo tee .env > /dev/null
@@ -76,7 +76,7 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-backend-dev
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-nginx-dev
-            docker-compose -f docker-compose.dev.yml --env-file ./.env up -d
+            docker compose -f docker-compose.dev.yml --env-file .env up -d
             docker image prune -f
 
 

build.gradle

@@ -63,6 +63,9 @@ dependencies {
     // Apache POI
     implementation 'org.apache.poi:poi:4.1.2'
     implementation 'org.apache.poi:poi-ooxml:4.1.2'
+
+    // actuator
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
 }
 
 tasks.named('test') {

docker-compose.dev.yml

@@ -9,6 +9,8 @@ services:
       - .env
     expose:
       - "8080"
+    depends_on:
+      - mysql
 
   nginx:
     image: ceos17/ceos-nginx-dev
@@ -18,9 +20,32 @@ services:
     ports:
       - "80:80"
 
+  mysql:
+    image: mysql:latest
+    container_name: mysql
+    restart: always
+    environment:
+      MYSQL_DATABASE: ceos-dev
+      MYSQL_USER: ${DB_USERNAME}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      TZ: Asia/Seoul
+    ports:
+      - "3306:3306"
+    command:
+      - "mysqld"
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+    volumes:
+      - ./data:/var/lib/mysql
+
+
+
+
   redis:
     image: redis:latest
     container_name: redis
     hostname: redis
     ports:
-      - "6379:6379"
+      - "6379:6379"
+

src/main/resources/application.yml

@@ -21,7 +21,7 @@ springdoc:
   default-produces-media-type: application/json
   swagger-ui:
     operations-sorter: alpha # 오름차순
-    path: /swagger-ui.html
+    path: /swagger
 
 logging.level:
   org.hibernate.SQL: debug