From 6b073e48f442e4aa0951db4075d6d5fdad09fd76 Mon Sep 17 00:00:00 2001
From: DDonghyeo <gsu9045000@gmail.com>
Date: Sun, 26 May 2024 00:09:01 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9Ddocs=20:=20ci/cd=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml                            | 4 +---
 apiGateway-service/src/main/resources/bootstrap.yml | 4 ++--
 docker-compose.yml                                  | 7 ++++---
 noti-service/src/main/resources/bootstrap.yml       | 4 ++--
 user-service/src/main/resources/bootstrap.yml       | 2 +-
 weather-service/src/main/resources/bootstrap.yml    | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index c43a6ad0..96482ad0 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -50,8 +50,7 @@ jobs:
           cd ./config-service/src/main/resources
           touch ./bootstrap.yml
           echo "${{ secrets.CONFIG_APPLICATION_YML }}" > ./bootstrap.yml
-          cd
-      
+
       # DockerHub Login
       - name: Docker Hub Login
         uses: docker/login-action@v2
@@ -62,7 +61,6 @@ jobs:
       #Config-Service Build & Docker Push
       - name: Build with Gradle - config
         run: |
-          docker builder prune 
           cd config-service
           ./gradlew clean build -x test
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/waither-config .
diff --git a/apiGateway-service/src/main/resources/bootstrap.yml b/apiGateway-service/src/main/resources/bootstrap.yml
index f36f218a..49a963e2 100644
--- a/apiGateway-service/src/main/resources/bootstrap.yml
+++ b/apiGateway-service/src/main/resources/bootstrap.yml
@@ -11,7 +11,7 @@ spring:
       uri: http://config:8888
       name: database-apiGateway, redis, jwt
   kafka:
-    bootstrap-servers: "localhost:9092"
+    bootstrap-servers: "http://kafka:9092"
     consumer:
       group-id: "GroupId"
 
@@ -20,7 +20,7 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: http://localhost:8761/eureka
+      defaultZone: http://eureka:8761/eureka
 
 #management: # Actuator Settings
 #  endpoints:
diff --git a/docker-compose.yml b/docker-compose.yml
index 4dcb3c8c..b8ba05f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,14 +23,15 @@ services:
     volumes:
       - /home/ec2-user/logs/api-gateway:/logs
 
+
   config:
     container_name: config
     image: ${DOCKERHUB_USERNAME}/waither-config
     ports:
       - "8888:8888"
-    environment:
-      CONFIG_GIT_URI : ${CONFIG_GIT_URI}
-      CONFIG_PASSPHRASE : ${CONFIG_PASSPHRASE}
+#    environment:
+#      CONFIG_GIT_URI : ${CONFIG_GIT_URI}
+#      CONFIG_PASSPHRASE : ${CONFIG_PASSPHRASE}
 #      CONFIG_PRIVATE_KEY_DIR : ${CONFIG_PRIVATE_KEY_DIR}
 #    restart: always
     restart: no
diff --git a/noti-service/src/main/resources/bootstrap.yml b/noti-service/src/main/resources/bootstrap.yml
index 75dfe11a..1c540186 100644
--- a/noti-service/src/main/resources/bootstrap.yml
+++ b/noti-service/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8089
+  port: 8082
 
 spring:
   application:
@@ -19,4 +19,4 @@ eureka:
     register-with-eureka: true # register to eureka server
     fetch-registry: true # Getting instances' information from eureka server
     service-url:
-      defaultZone : http://127.0.0.1:8761/eureka #Eureka Server's address
\ No newline at end of file
+      defaultZone : http://eureka:8761/eureka #Eureka Server's address
\ No newline at end of file
diff --git a/user-service/src/main/resources/bootstrap.yml b/user-service/src/main/resources/bootstrap.yml
index c7977aa7..df14cb37 100644
--- a/user-service/src/main/resources/bootstrap.yml
+++ b/user-service/src/main/resources/bootstrap.yml
@@ -21,7 +21,7 @@ eureka:
     register-with-eureka: true # register to eureka server
     fetch-registry: true # Getting instances' information from eureka server
     service-url:
-      defaultZone : http://127.0.0.1:8761/eureka #Eureka Server's address
+      defaultZone : http://eureka:8761/eureka #Eureka Server's address
 
 #management: # Actuator
 #  endpoints:
diff --git a/weather-service/src/main/resources/bootstrap.yml b/weather-service/src/main/resources/bootstrap.yml
index 4abbfad6..0f023d22 100644
--- a/weather-service/src/main/resources/bootstrap.yml
+++ b/weather-service/src/main/resources/bootstrap.yml
@@ -21,7 +21,7 @@ eureka:
     register-with-eureka: true # register to eureka server
     fetch-registry: true # Getting instances' information from eureka server
     service-url:
-      defaultZone : http://127.0.0.1:8761/eureka #Eureka Server's address
+      defaultZone : http://eureka:8761/eureka #Eureka Server's address
 
 management: # Actuator
   endpoints: