From f028af547388261f58dc3bb58b734f5378b82217 Mon Sep 17 00:00:00 2001
From: DDonghyeo <gsu9045000@gmail.com>
Date: Fri, 24 May 2024 00:16:49 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=9Ddocs=20:=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yml          |  2 +-
 docker-compose.yml                            | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config-service/src/main/resources/bootstrap.yml b/config-service/src/main/resources/bootstrap.yml
index 1963e0d2..f312c907 100644
--- a/config-service/src/main/resources/bootstrap.yml
+++ b/config-service/src/main/resources/bootstrap.yml
@@ -13,4 +13,4 @@ spring:
           uri: ${CONFIG_GIT_URI}
           ignore-local-ssh-settings: true
           passphrase: ${CONFIG_PASSPHRASE}
-          private-key: ${CONFIG_PRIVATE_KEY_DIR}
+          private-key: ${CONFIG_PRIVATE_KEY}
diff --git a/docker-compose.yml b/docker-compose.yml
index 3a6e6fa9..68baabe3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,8 @@ services:
     image: ${DOCKERHUB_USERNAME}/waither-gateway
     expose:
       - "8000"
-    restart: always
+#    restart: always
+    restart: no
     volumes:
       - /home/ec2-user/logs/api-gateway:/logs
 
@@ -30,8 +31,9 @@ services:
     environment:
       CONFIG_GIT_URI : ${CONFIG_GIT_URI}
       CONFIG_PASSPHRASE : ${CONFIG_PASSPHRASE}
-      CONFIG_PRIVATE_KEY_DIR : ${CONFIG_PRIVATE_KEY_DIR}
-    restart: always
+#      CONFIG_PRIVATE_KEY_DIR : ${CONFIG_PRIVATE_KEY_DIR}
+#    restart: always
+    restart: no
     volumes:
       - /home/ec2-user/logs/config:/logs
 
@@ -40,7 +42,8 @@ services:
     image: ${DOCKERHUB_USERNAME}/waither-eureka
     expose:
       - "8761"
-    restart: always
+#    restart: always
+    restart: no
     volumes:
       - /home/ec2-user/logs/eureka:/logs
 
@@ -49,7 +52,8 @@ services:
     image: ${DOCKERHUB_USERNAME}/waither-user
     expose:
       - "8080"
-    restart: unless-stopped #수동으로 중지되지 않는 이상 항상 재실행
+#    restart: unless-stopped #수동으로 중지되지 않는 이상 항상 재실행
+    restart: no
     volumes:
       - /home/ec2-user/logs/user-service:/logs
 
@@ -58,7 +62,8 @@ services:
     image: ${DOCKERHUB_USERNAME}/waither-weather
     expose:
       - "8081"
-    restart: unless-stopped
+#    restart: unless-stopped
+    restart: no
     volumes:
       - /home/ec2-user/logs/weather-service:/logs
 
@@ -67,7 +72,8 @@ services:
     image: ${DOCKERHUB_USERNAME}/waither-noti
     expose:
       - "8082"
-    restart: unless-stopped
+#    restart: unless-stopped
+    restart: no
     volumes:
       - /home/ec2-user/logs/noti-service:/logs
         
@@ -76,6 +82,7 @@ services:
     container_name: zookeeper
     ports:
       - "2181:2181"
+
   kafka:
     image: wurstmeister/kafka:latest
     container_name: kafka

From 741ca9126d9d1624920267b911d3cfdf4e6e2895 Mon Sep 17 00:00:00 2001
From: Kim Dong Hyun <98632435+DDonghyeo@users.noreply.github.com>
Date: Fri, 24 May 2024 00:18:26 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9Ddocs=20:=20cd.yml=20deploy=20ke?=
 =?UTF-8?q?y=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index be800e1e..4f9f8974 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -135,7 +135,6 @@ jobs:
           script: |
             export CONFIG_GIT_URI=${{ secrets.CONFIG_GIT_URI }}
             export CONFIG_PASSPHRASE=${{ secrets.CONFIG_PASSPHRASE }}
-            export CONFIG_PRIVATE_KEY=${{ secrets.CONFIG_PRIVATE_KEY_DIR }}
             export DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
 
             bash /home/docker_init.sh