Merge branch 'dev' into main

Author: jiminnimij

.github/workflows/deploy_dev.yml

@@ -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
 
 

docker-compose.dev.yml

@@ -9,6 +9,8 @@ services:
       - .env
     expose:
       - "8080"
+    depends_on:
+      - mysql
 
   nginx:
     image: ceos17/ceos-nginx-dev
@@ -23,11 +25,17 @@ services:
     container_name: mysql
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
       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
 
@@ -41,4 +49,3 @@ services:
     ports:
       - "6379:6379"
 
-