Merge pull request #100 from zeze1004/chore/setting-DB-option

[#99] 개발 배포 스크립트 수정
zeze1004 · May 23, 2024 · 80c9d9f · 80c9d9f
2 parents 38678ef + df4823e
commit 80c9d9f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -17,10 +17,9 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: "17"
-          distribution: "temurin" # https://github.com/actions/setup-java
+          distribution: "temurin"
           cache: gradle
 
-      ## gradle caching
       - name: Gradle Caching
         uses: actions/cache@v3
         with:
@@ -50,7 +49,9 @@ jobs:
 
       - name: Deploy using docker-compose
         run: |
+          docker-compose -f docker-compose-dev.yml down -d
           docker-compose -f docker-compose-dev.yml up -d
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          IMAGE_NAME: ${{ secrets.DOCKER_USERNAME }}/odee-project:${{ github.ref_name }}
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -1,21 +1,30 @@
 version: '3.8'
 services:
   app:
-    build: .
+    image: ${IMAGE_NAME}
+    networks:
+      - app-network
     depends_on:
       - mysql
     ports:
       - "8080:8080"
     volumes:
       - ./logs:/app/logs
+    environment:
+      SPRING_PROFILES_ACTIVE: dev
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/wedding
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD:
   mysql:
     image: mysql:8.0.28
     platform: linux/amd64
+    networks:
+      - app-network
     environment:
       MYSQL_DATABASE: wedding
-      MYSQL_USER: user
+      MYSQL_USER: root
       MYSQL_PASSWORD:
-      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_PASSWORD:
     ports:
       - "3306:3306"
     volumes:
@@ -24,7 +33,13 @@ services:
     image: nginx:latest
     ports:
       - "80:80"
+    networks:
+      - app-network
     volumes:
-      - ./nginx-dev/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-dev:/etc/nginx
     depends_on:
       - app
+
+networks:
+  app-network:
+    driver: bridge
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -22,6 +22,8 @@ spring:
       on-profile: dev
   datasource:
     url: jdbc:mysql://mysql:3306/wedding
+    username: root
+    password:
 mybatis:
   mapper-locations: classpath:mapper/**/*.xml
   type-aliases-package: org.wedding.*