Merge pull request #4 from Team-UMC/ci/#1/ci-cd-setting

Ci/#1/ci cd setting
Team-UMC · Jan 6, 2024 · 8537174 · 8537174
2 parents feb86ce + 6bbffd6
commit 8537174
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 10 deletions.
diff --git a/.github/workflows/umc-service-dev.yml b/.github/workflows/umc-service-dev.yml
@@ -21,7 +21,6 @@ jobs:
         run: |
           # create application.yml
           cd ./src/main
-          mkdir resources
           cd ./resources
 
           # application.yml 파일 생성하기

diff --git a/.github/workflows/umc-service-prod.yml b/.github/workflows/umc-service-prod.yml
@@ -22,8 +22,7 @@ jobs:
         run: |
           # create application.yml
           cd ./src/main
-          mkdir resources
-          cd ./resources
+          cd ./resources  
 
           # application.yml 파일 생성하기
           touch ./application.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -4,8 +4,6 @@ services: # 컨테이너 설정
   backend:
     container_name: umc-service-dev
     image: kimjunseok/umcservice-dev
-    env_file:
-      - .env
     environment:
       - SPRING_PROFILES_ACTIVE=dev
     ports:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -4,8 +4,6 @@ services: # 컨테이너 설정
   backend:
     container_name: umc-service
     image: kimjunseok/umcservice
-    env_file:
-      - .env
     environment:
       - SPRING_PROFILES_ACTIVE=prod
     ports:

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -6,7 +6,6 @@ spring:
     name: umc-service-dev
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${DATABASE_URL_DEV}
 
     config:
       import: classpath:application.yml

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -6,7 +6,6 @@ spring:
     name: umc-service-local
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/umc-service?serverTimezone=Asia/Seoul
 
     config:
       import: classpath:application.yml

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -6,7 +6,6 @@ spring:
     name: umc-service-prod
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${DATABASE_URL}
 
     config:
       import: classpath:application.yml