diff --git a/.github/workflows/CI-CD_Pipeline.yml b/.github/workflows/CI-CD_Pipeline.yml index eae29d76..a27abc9e 100644 --- a/.github/workflows/CI-CD_Pipeline.yml +++ b/.github/workflows/CI-CD_Pipeline.yml @@ -239,7 +239,7 @@ jobs: aws-region: ${{ secrets.AWS_REGION }} aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - instance-ids: "i-080fa29898420c33f" + instance-ids: "i-0270c8de5e05c2f6a" working-directory: / comment: Deploy command: | @@ -259,7 +259,7 @@ jobs: CUSTOM_JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} CUSTOM_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS=3600 - PROD_DATASOURCE_URL=jdbc:mysql://mysql:3306/${{ secrets.DB_NAME }}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul + PROD_DATASOURCE_URL=jdbc:mysql://mysql:3306/${{ secrets.DB_NAME }}?createDatabaseIfNotExist=true&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul PROD_DATASOURCE_DRIVER=com.mysql.cj.jdbc.Driver PROD_DATASOURCE_USERNAME=root PROD_DATASOURCE_PASSWORD=${{ secrets.DB_PASSWORD }} diff --git a/infra/main.tf b/infra/main.tf index 1388dd1a..d5b928e8 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -224,8 +224,8 @@ docker run -d \ -e TZ=Asia/Seoul \ -e INITIAL_ADMIN_EMAIL=admin@npm.com \ -e INITIAL_ADMIN_PASSWORD=${var.password_1} \ - -v /dockerProjects/npm_1/volumes/data:/data \ - -v /dockerProjects/npm_1/volumes/etc/letsencrypt:/etc/letsencrypt \ + -v /dockerProjects/npm/volumes/data:/data \ + -v /dockerProjects/npm/volumes/etc/letsencrypt:/etc/letsencrypt \ jc21/nginx-proxy-manager:latest # redis 설치 @@ -241,8 +241,8 @@ docker run -d \ docker run -d \ --name mysql \ --restart unless-stopped \ - -v /dockerProjects/mysql_1/volumes/var/lib/mysql:/var/lib/mysql \ - -v /dockerProjects/mysql_1/volumes/etc/mysql/conf.d:/etc/mysql/conf.d \ + -v /dockerProjects/mysql/volumes/var/lib/mysql:/var/lib/mysql \ + -v /dockerProjects/mysql/volumes/etc/mysql/conf.d:/etc/mysql/conf.d \ --network common \ -p 3306:3306 \ -e MYSQL_ROOT_PASSWORD=${var.password_1} \ @@ -251,13 +251,13 @@ docker run -d \ # MySQL 컨테이너가 준비될 때까지 대기 echo "MySQL이 기동될 때까지 대기 중..." -until docker exec mysql_1 mysql -uroot -p${var.password_1} -e "SELECT 1" &> /dev/null; do +until docker exec mysql mysql -uroot -p${var.password_1} -e "SELECT 1" &> /dev/null; do echo "MySQL이 아직 준비되지 않음. 5초 후 재시도..." sleep 5 done echo "MySQL이 준비됨. 초기화 스크립트 실행 중..." -docker exec mysql_1 mysql -uroot -p${var.password_1} -e " +docker exec mysql mysql -uroot -p${var.password_1} -e " CREATE USER 'lldjlocal'@'127.0.0.1' IDENTIFIED WITH caching_sha2_password BY '1234'; CREATE USER 'lldjlocal'@'172.18.%.%' IDENTIFIED WITH caching_sha2_password BY '1234'; CREATE USER 'lldj'@'%' IDENTIFIED WITH caching_sha2_password BY '${var.password_1}';