Merge pull request #130 from Team-Motivoo/fix/#121-firebase_db_step_c…

…ount

[DOCS] Docker를 이용한 빌드 설정 변경

.github/workflows/api-CD.yml

@@ -68,7 +68,7 @@ jobs:
 
       - name: Docker Image 빌드 및 푸시
         run: |
-          docker build --platform linux/amd64 -t yejunpark1/motivoo-api-server .
+          docker build --platform linux/amd64 -f Dockerfile-API -t yejunpark1/motivoo-api-server .
           docker push yejunpark1/motivoo-api-server
 
       - name: deploy.sh EC2 인스턴스로 전송

.github/workflows/batch-CD.yml

@@ -81,7 +81,7 @@ jobs:
 
       - name: Docker Image 빌드 및 푸시
         run: |
-          docker build --platform linux/amd64 -t yejunpark1/motivoo-batch-server .
+          docker build --platform linux/amd64 -f Dockerfile-BATCH -t yejunpark1/motivoo-batch-server .
           docker push yejunpark1/motivoo-batch-server
 
       - name: deploy.sh EC2 인스턴스로 전송

Dockerfile-API

@@ -0,0 +1,4 @@
+FROM amd64/amazoncorretto:17
+WORKDIR /app
+COPY ./motivoo-api/build/libs/motivoo-api-0.0.1-SNAPSHOT.jar /app/API_APPLICATION.jar
+CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=deploy", "API_APPLICATION.jar"]

Dockerfile → Dockerfile-BATCH

@@ -1,6 +1,4 @@
 FROM amd64/amazoncorretto:17
 WORKDIR /app
-COPY ./motivoo-api/build/libs/motivoo-api-0.0.1-SNAPSHOT.jar /app/API_APPLICATION.jar
 COPY ./motivoo-batch/build/libs/motivoo-batch-0.0.1-SNAPSHOT.jar /app/BATCH_APPLICATION.jar
-CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=deploy", "API_APPLICATION.jar"]
 CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=deploy", "BATCH_APPLICATION.jar"]

docker-compose.yml

@@ -17,6 +17,8 @@ services:
       - TZ=Asia/Seoul
     depends_on:
       - redis
+    networks:
+      - motivoo-net
 
   blue-batch:
     container_name: blue-batch
@@ -27,8 +29,8 @@ services:
       - "8081:8081"
     environment:
       - TZ=Asia/Seoul
-    depends_on:
-      - redis
+    networks:
+      - motivoo-net
 
 
   green-api:
@@ -42,7 +44,8 @@ services:
       - TZ=Asia/Seoul
     depends_on:
       - redis
-
+    networks:
+      - motivoo-net
 
   green-batch:
     container_name: green-batch
@@ -53,5 +56,9 @@ services:
       - "8083:8081"
     environment:
       - TZ=Asia/Seoul
-    depends_on:
-      - redis
+    networks:
+      - motivoo-net
+
+networks:
+  motivoo-net:
+    driver: bridge