From 1f8b7bd6750f9c699ea26136f6291281a0c04ce9 Mon Sep 17 00:00:00 2001 From: kyeong-hyeok Date: Sat, 7 Oct 2023 14:42:04 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20deploy.sh=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 15 --------------- .idea/gradle.xml | 16 ---------------- .idea/jarRepositories.xml | 20 -------------------- .idea/misc.xml | 8 -------- .idea/vcs.xml | 6 ------ scripts/deploy.sh | 30 ++++++++++++------------------ 6 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 65afa4b..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 39ec4f5..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9676474..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/scripts/deploy.sh b/scripts/deploy.sh index e4a683a..dd97f75 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -10,15 +10,12 @@ if [ -z $IS_GREEN_EXIST ]; then docker-compose pull green echo ">>> green container를 up합니다." docker-compose up -d green - while [ 1 = 1 ]; do - echo ">>> green health check 중..." - sleep 3 - REQUEST=$(curl http://127.0.0.1:8082) - if [ -n "$REQUEST" ]; then - echo ">>> 🍃 health check success !" - break; - fi - done + echo ">>> green health check 중..." + sleep 3 + GREEN_HEALTH=$(docker ps | grep green) + if [ -n "$GREEN_HEALTH" ]; then + echo ">>> 🍃 health check success !" + fi sleep 3 echo ">>> nginx를 다시 실행 합니다." sudo cp /etc/nginx/nginx.green.conf /etc/nginx/nginx.conf @@ -33,15 +30,12 @@ else docker-compose pull blue echo ">>> blue container up합니다." docker-compose up -d blue - while [ 1 = 1 ]; do - echo ">>> blue health check 중..." - sleep 3 - REQUEST=$(curl http://127.0.0.1:8081) - if [ -n "$REQUEST" ]; then - echo ">>> 🍃 health check success !" - break; - fi - done + echo ">>> blue health check 중..." + sleep 3 + BLUE_HEALTH=$(docker ps | grep blue) + if [ -n "$BLUE_HEALTH" ]; then + echo ">>> 🍃 health check success !" + fi sleep 3 echo ">>> nginx를 다시 실행 합니다." sudo cp /etc/nginx/nginx.blue.conf /etc/nginx/nginx.conf