Merge pull request #221 from MOONSHOT-Team/feature/#220

[Fix] #220 - CI, CD job name 변경
MOONSHOT-Team · Feb 27, 2024 · 7972f51 · 7972f51
2 parents 72f1026 + e9dd72d
commit 7972f51
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/dev-CD.yml b/.github/workflows/dev-CD.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "develop" ]
 
 jobs:
-  deploy-ci:
+  dev-ci:
     runs-on: ubuntu-22.04
 
     steps:
@@ -44,8 +44,8 @@ jobs:
           docker build -f Dockerfile-dev --platform linux/amd64 -t teammoonshot/dev-server .
           docker push teammoonshot/dev-server
 
-  deploy-cd:
-    needs: deploy-ci
+  dev-cd:
+    needs: dev-ci
     runs-on: ubuntu-22.04
 
     steps:

diff --git a/.github/workflows/dev-CI.yml b/.github/workflows/dev-CI.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "develop" ]
 
 jobs:
-  build:
+  dev-build-TEST:
     runs-on: ubuntu-22.04
 
     steps:

diff --git a/.github/workflows/prod-CD.yml b/.github/workflows/prod-CD.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  deploy-ci:
+  prod-ci:
     runs-on: ubuntu-22.04
 
     steps:
@@ -44,7 +44,7 @@ jobs:
           docker build --platform linux/amd64 -t teammoonshot/server .
           docker push teammoonshot/server
 
-  deploy-cd:
+  prod-cd:
     needs: deploy-ci
     runs-on: ubuntu-22.04
 

diff --git a/.github/workflows/prod-CI.yml b/.github/workflows/prod-CI.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
+  prod-build-TEST:
     runs-on: ubuntu-22.04
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -4,4 +4,4 @@ WORKDIR /app
 
 COPY moonshot-api/build/libs/moonshot-api-0.0.1-SNAPSHOT.jar /app/moonshot.jar
 
-CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=deploy", "moonshot.jar"]
+CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=prod", "moonshot.jar"]
diff --git a/...api/src/main/resources/logback-deploy.xml → ...t-api/src/main/resources/logback-prod.xml b/...api/src/main/resources/logback-deploy.xml → ...t-api/src/main/resources/logback-prod.xml
@@ -2,7 +2,7 @@
     <property name="LOG_PATTERN"
               value="[%d{yyyy-MM-dd HH:mm:ss}:%-4relative] %green([%thread]) %highlight(%-5level) %boldWhite([%C.%M:%yellow(%L)]) - %msg%n"/>
     <springProperty name="DISCORD_WEBHOOK_URI" source="logging.discord.webhook-uri"/>
-    <springProfile name="deploy">
+    <springProfile name="prod">
         <include resource="console-appender.xml"/>
         <include resource="discord-appender.xml"/>
         <root level="INFO">
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         branches: [ "develop" ]
     jobs:
-      build:
+      dev-build-TEST:
         runs-on: ubuntu-22.04
         steps:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ WORKDIR /app

		COPY moonshot-api/build/libs/moonshot-api-0.0.1-SNAPSHOT.jar /app/moonshot.jar

		CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=deploy", "moonshot.jar"]
		CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=prod", "moonshot.jar"]