From 25263a97a6fb26b3e3a2de3b1d219bcc3bc19564 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Wed, 16 Oct 2024 15:29:16 +0900 Subject: [PATCH 01/33] =?UTF-8?q?chore:=20=EB=A1=9C=EC=BB=AC=20IP=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 80030354e..d8294db11 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -110,9 +110,17 @@ jobs: - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports run: | + ip_blue="172.18.0.3" + ip_green="172.18.0.2" + ports=(8080 8081) ip="127.0.0.1" ports=(8080 8081) for port in "${ports[@]}"; do + if [ $port -eq 8080 ]; then + ip=$ip_blue + else + ip=$ip_green + fi RESPONSE=$(curl -s http://$ip:$port/api/actuator/health) IS_ACTIVE=$(echo ${RESPONSE} | grep 'UP' | wc -l) if [ $IS_ACTIVE -eq 1 -a $port -eq "8080" ]; then From 0dcc589f1e6b7c5c645f14ea29ffe952a2f7942f Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Wed, 16 Oct 2024 17:39:54 +0900 Subject: [PATCH 02/33] =?UTF-8?q?chore:=20=EB=B8=94=EB=A3=A8=20=EA=B7=B8?= =?UTF-8?q?=EB=A6=B0=20=ED=8F=AC=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index d8294db11..67b2d1c66 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -110,17 +110,9 @@ jobs: - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports run: | - ip_blue="172.18.0.3" - ip_green="172.18.0.2" ports=(8080 8081) ip="127.0.0.1" - ports=(8080 8081) for port in "${ports[@]}"; do - if [ $port -eq 8080 ]; then - ip=$ip_blue - else - ip=$ip_green - fi RESPONSE=$(curl -s http://$ip:$port/api/actuator/health) IS_ACTIVE=$(echo ${RESPONSE} | grep 'UP' | wc -l) if [ $IS_ACTIVE -eq 1 -a $port -eq "8080" ]; then From 8c83a64da1fba80b0b8b5f9bf2b62fff907357fe Mon Sep 17 00:00:00 2001 From: lemone Date: Wed, 16 Oct 2024 18:00:17 +0900 Subject: [PATCH 03/33] =?UTF-8?q?chore:=20=EA=B7=B8=EB=A6=B0=20=ED=8F=AC?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/be_app-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/be_app-docker-compose.yml b/backend/be_app-docker-compose.yml index c232f4106..187bb0aa9 100644 --- a/backend/be_app-docker-compose.yml +++ b/backend/be_app-docker-compose.yml @@ -32,7 +32,7 @@ services: image: ${DOCKER_REPO_NAME}/springboot-app:test-latest platform: linux/arm64 ports: - - "${GREEN_SERVER_BINDING_PORT}:8081" + - "${GREEN_SERVER_BINDING_PORT}:8080" volumes: - ${SERVER_LOGS_PATH}/springboot-app/green:/logs - ${SERVER_LOGS_PATH}/springboot-app/backup/green:/logs/backup From cfdf3ba33d17e3daf5c72933a2bba1bcf9284ffb Mon Sep 17 00:00:00 2001 From: lemone Date: Thu, 17 Oct 2024 14:01:28 +0900 Subject: [PATCH 04/33] =?UTF-8?q?refactor:=20GREEN=20=ED=8F=AC=ED=8A=B8=20?= =?UTF-8?q?8081:8081=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/be_app-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/be_app-docker-compose.yml b/backend/be_app-docker-compose.yml index 187bb0aa9..c232f4106 100644 --- a/backend/be_app-docker-compose.yml +++ b/backend/be_app-docker-compose.yml @@ -32,7 +32,7 @@ services: image: ${DOCKER_REPO_NAME}/springboot-app:test-latest platform: linux/arm64 ports: - - "${GREEN_SERVER_BINDING_PORT}:8080" + - "${GREEN_SERVER_BINDING_PORT}:8081" volumes: - ${SERVER_LOGS_PATH}/springboot-app/green:/logs - ${SERVER_LOGS_PATH}/springboot-app/backup/green:/logs/backup From 94c77cd83ec3a313f51b128ee2fe7cacf976dbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 14:08:30 +0900 Subject: [PATCH 05/33] =?UTF-8?q?[BE]=20=ED=8F=AC=ED=8A=B8=20=EB=B9=84?= =?UTF-8?q?=EA=B5=90=20=EB=B0=94=EA=BF=94=EB=B3=B4=EA=B8=B0=20(#813)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 67b2d1c66..667eb1b1e 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -105,7 +105,7 @@ jobs: - name: Deploy docker container run: | sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml up -d - + # 실행중인 서버 확인 - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports @@ -114,16 +114,17 @@ jobs: ip="127.0.0.1" for port in "${ports[@]}"; do RESPONSE=$(curl -s http://$ip:$port/api/actuator/health) - IS_ACTIVE=$(echo ${RESPONSE} | grep 'UP' | wc -l) - if [ $IS_ACTIVE -eq 1 -a $port -eq "8080" ]; then + IS_ACTIVE=$(echo "$RESPONSE" | grep 'UP' | wc -l) + if [ $IS_ACTIVE -eq 1 ] && [ $port -eq 8080 ]; then echo "BLUE_PORT=8080" >> $GITHUB_ENV echo "GREEN_PORT=8081" >> $GITHUB_ENV - elif [ $IS_ACTIVE -eq 1 -a $port -eq "8081" ]; then + elif [ $IS_ACTIVE -eq 1 ] && [ $port -eq 8081 ]; then echo "BLUE_PORT=8081" >> $GITHUB_ENV echo "GREEN_PORT=8080" >> $GITHUB_ENV fi done + - name: Start the new (green/blue) environment run: | sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p ${{ env.GREEN_PORT }} up -d From 8524164366bbcc5cf8c5a442d543b210b4c33dc3 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 15:06:05 +0900 Subject: [PATCH 06/33] =?UTF-8?q?chore:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 67b2d1c66..b876a9aea 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -109,24 +109,18 @@ jobs: # 실행중인 서버 확인 - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports - run: | - ports=(8080 8081) - ip="127.0.0.1" - for port in "${ports[@]}"; do - RESPONSE=$(curl -s http://$ip:$port/api/actuator/health) - IS_ACTIVE=$(echo ${RESPONSE} | grep 'UP' | wc -l) - if [ $IS_ACTIVE -eq 1 -a $port -eq "8080" ]; then - echo "BLUE_PORT=8080" >> $GITHUB_ENV - echo "GREEN_PORT=8081" >> $GITHUB_ENV - elif [ $IS_ACTIVE -eq 1 -a $port -eq "8081" ]; then - echo "BLUE_PORT=8081" >> $GITHUB_ENV - echo "GREEN_PORT=8080" >> $GITHUB_ENV - fi - done + run: | + chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 + OUTPUT=$(./deploy.sh) # 스크립트 실행 후 결과를 변수에 저장 + # 실행중인 서버 확인 + + source ./deploy.sh + echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV + echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV - name: Start the new (green/blue) environment run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p ${{ env.GREEN_PORT }} up -d + sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d - name: Wait for new environment to be healthy run: | @@ -134,8 +128,8 @@ jobs: - name: Switch traffic to new environment run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p ${{ env.GREEN_PORT }} up -d --scale springboot-app=1 + sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d --scale springboot-app=1 - name: Stop and remove the old environment run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p ${{ env.BLUE_PORT }} down + sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $BLUE_PORT down From 179a0e7c3206cd8b048a3a368cc06ced05b4730d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 15:31:53 +0900 Subject: [PATCH 07/33] =?UTF-8?q?[BE]=20=EB=AC=B4=EC=A4=91=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index e2e720948..fb49014a7 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -110,6 +110,7 @@ jobs: - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports run: | + echo $(pwd) chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 OUTPUT=$(./deploy.sh) # 스크립트 실행 후 결과를 변수에 저장 source ./deploy.sh From 20a4f7e6139075f80369554f9731604371d5faee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 15:38:39 +0900 Subject: [PATCH 08/33] Update be_cd-test.yml --- .github/workflows/be_cd-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index fb49014a7..992debe39 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -112,8 +112,11 @@ jobs: run: | echo $(pwd) chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 + echo chomod ok OUTPUT=$(./deploy.sh) # 스크립트 실행 후 결과를 변수에 저장 + echo hello $OUTPUT source ./deploy.sh + echo source ok echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV From f0c30dbfa9796cd3b161559783579af0abe27ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 15:41:48 +0900 Subject: [PATCH 09/33] =?UTF-8?q?[BE]=20=EB=AC=B4=EC=A4=91=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 992debe39..c625a8775 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -112,9 +112,7 @@ jobs: run: | echo $(pwd) chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 - echo chomod ok - OUTPUT=$(./deploy.sh) # 스크립트 실행 후 결과를 변수에 저장 - echo hello $OUTPUT + echo chmod ok source ./deploy.sh echo source ok echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV From db391c8eebf4b9b424318db7bf6dbf7de741e51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 15:53:52 +0900 Subject: [PATCH 10/33] =?UTF-8?q?[BE]=20=EB=AC=B4=EC=A4=91=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index c625a8775..e2c2e7020 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -110,6 +110,8 @@ jobs: - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports run: | + echo test curl + curl http://localhost:8080/api/actuator/health echo $(pwd) chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 echo chmod ok From fd0d28d5bc8b5770b43669fbe3836d0b05301bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 16:12:00 +0900 Subject: [PATCH 11/33] =?UTF-8?q?chore:=20=EB=AC=B4=EC=A4=91=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index e2c2e7020..1726deb85 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -99,12 +99,12 @@ jobs: SERVER_LOGS_PATH=${{ secrets.SERVER_LOGS_PATH }} EOF - - name: Stop and remove existing containers - run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml down --rmi all - - name: Deploy docker container - run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml up -d + #- name: Stop and remove existing containers + #run: | + # sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml down --rmi all + #- name: Deploy docker container + #run: | + # sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml up -d # 실행중인 서버 확인 - name: Determine Active and Inactive Ports (Blue/Green) From 49d5375602e84bc64b6cafa057dd6b47a4dfb92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A2=85?= Date: Thu, 17 Oct 2024 16:53:28 +0900 Subject: [PATCH 12/33] =?UTF-8?q?chore:=20=EB=AC=B4=EC=A4=91=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 1726deb85..7f0298b55 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -110,8 +110,6 @@ jobs: - name: Determine Active and Inactive Ports (Blue/Green) id: determine-ports run: | - echo test curl - curl http://localhost:8080/api/actuator/health echo $(pwd) chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 echo chmod ok From c51bd940b8ab0a09a766f65fc8284954b19cf95b Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 16:59:53 +0900 Subject: [PATCH 13/33] =?UTF-8?q?chore:=20=EB=B3=80=EC=88=98=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 1726deb85..cba80f70b 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -126,7 +126,7 @@ jobs: - name: Wait for new environment to be healthy run: | - until sudo docker inspect --format '{{json .State.Health.Status}}' $GREEN_PORT_springboot-app | grep "healthy"; do sleep 5; done + until sudo docker inspect --format '{{json .State.Health.Status}}' ${GREEN_PORT}_springboot-app | grep "healthy"; do sleep 5; done - name: Switch traffic to new environment run: | From 18fd9da31b40300f9ca8e2777aa0d44f73d79b41 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 17:29:06 +0900 Subject: [PATCH 14/33] =?UTF-8?q?chore:=20=EB=8F=84=EC=BB=A4=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EC=A6=88=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/be_app-docker-compose.yml | 32 ++----------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/backend/be_app-docker-compose.yml b/backend/be_app-docker-compose.yml index c232f4106..34b00cbba 100644 --- a/backend/be_app-docker-compose.yml +++ b/backend/be_app-docker-compose.yml @@ -1,38 +1,10 @@ services: - - springboot-blue: - container_name: coduo_springboot-app-blue - image: ${DOCKER_REPO_NAME}/springboot-app:test-latest - platform: linux/arm64 - ports: - - "${BLUE_SERVER_BINDING_PORT}:8080" - volumes: - - ${SERVER_LOGS_PATH}/springboot-app/blue:/logs - - ${SERVER_LOGS_PATH}/springboot-app/backup/blue:/logs/backup - environment: - SPRING_DATASOURCE_REPLICA_MASTER_JDBC-URL: ${MASTER_DB_URL} - SPRING_DATASOURCE_REPLICA_MASTER_USERNAME: ${MASTER_DB_USERNAME} - SPRING_DATASOURCE_REPLICA_MASTER_PASSWORD: ${MASTER_DB_PASSWORD} - SPRING_DATASOURCE_REPLICA_SLAVE_JDBC-URL: ${SLAVE_DB_URL} - SPRING_DATASOURCE_REPLICA_SLAVE_USERNAME: ${SLAVE_DB_USERNAME} - SPRING_DATASOURCE_REPLICA_SLAVE_PASSWORD: ${SLAVE_DB_PASSWORD} - SPRING_JPA_HIBERNATE_DDL-AUTO: ${DDL_AUTO} - OAUTH_GITHUB_CLIENT_ID: ${CLIENT_ID} - OAUTH_GITHUB_CLIENT_SECRET: ${CLIENT_SECRET} - OAUTH_GITHUB_REDIRECT_URI: ${CLIENT_REDIRECT_URI} - JWT_SIGN_KEY: ${JWT_KEY} - EC2_PREFIX: ${INSTANCE_NAME} - SERVER_PORT: ${BLUE_SERVER_BINDING_PORT} - restart: on-failure - networks: - - coduo_net - springboot-green: - container_name: coduo_springboot-app-green + container_name: coduo_springboot-app-${GREEN_SERVER_BINDING_PORT} image: ${DOCKER_REPO_NAME}/springboot-app:test-latest platform: linux/arm64 ports: - - "${GREEN_SERVER_BINDING_PORT}:8081" + - "${GREEN_SERVER_BINDING_PORT}:${GREEN_SERVER_BINDING_PORT}" volumes: - ${SERVER_LOGS_PATH}/springboot-app/green:/logs - ${SERVER_LOGS_PATH}/springboot-app/backup/green:/logs/backup From 306ba73d545fd5ae00ab24648d4c3d55e9450b54 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 17:33:28 +0900 Subject: [PATCH 15/33] =?UTF-8?q?chore:=20yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 0aa636d89..5dde20920 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -124,7 +124,7 @@ jobs: - name: Wait for new environment to be healthy run: | - until sudo docker inspect --format '{{json .State.Health.Status}}' ${GREEN_PORT}_springboot-app | grep "healthy"; do sleep 5; done + until sudo docker inspect --format '{{json .State.Health.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "healthy"; do sleep 5; done - name: Switch traffic to new environment run: | From eb6989e03cf1536b179883bf2ec9b9c4244cbfc1 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 17:53:42 +0900 Subject: [PATCH 16/33] =?UTF-8?q?chore:=20yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 5dde20920..a4dc535a4 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -69,6 +69,14 @@ jobs: - name: Extract secrets as .be_app-env file run: | + echo $(pwd) + chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 + echo chmod ok + source ./deploy.sh + echo source ok + echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV + echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV + cat < ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env # Docker Hub info from Github Secrets @@ -94,8 +102,8 @@ jobs: INSTANCE_NAME=${{ secrets.INSTANCE_A_NAME }} # Server App - BLUE_SERVER_BINDING_PORT=${{ secrets.BLUE_SERVER_BINDING_PORT }} - GREEN_SERVER_BINDING_PORT=${{ secrets.GREEN_SERVER_BINDING_PORT }} + BLUE_SERVER_BINDING_PORT=${BLUE_PORT} + GREEN_SERVER_BINDING_PORT=${GREEN_PORT} SERVER_LOGS_PATH=${{ secrets.SERVER_LOGS_PATH }} EOF @@ -107,16 +115,16 @@ jobs: # sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml up -d # 실행중인 서버 확인 - - name: Determine Active and Inactive Ports (Blue/Green) - id: determine-ports - run: | - echo $(pwd) - chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 - echo chmod ok - source ./deploy.sh - echo source ok - echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV - echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV +# - name: Determine Active and Inactive Ports (Blue/Green) +# id: determine-ports +# run: | +# echo $(pwd) +# chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 +# echo chmod ok +# source ./deploy.sh +# echo source ok +# echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV +# echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV - name: Start the new (green/blue) environment run: | From 05661fae0bd01333ace1a9096fa5f66b5a001808 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 18:04:05 +0900 Subject: [PATCH 17/33] =?UTF-8?q?chore:=20yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index a4dc535a4..41e779e1a 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -132,7 +132,7 @@ jobs: - name: Wait for new environment to be healthy run: | - until sudo docker inspect --format '{{json .State.Health.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "healthy"; do sleep 5; done + until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done - name: Switch traffic to new environment run: | From e80fee16bd7ebee3b9b5084f0a3e88b2890637a6 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Thu, 17 Oct 2024 18:10:09 +0900 Subject: [PATCH 18/33] =?UTF-8?q?chore:=20=EC=8A=A4=EC=9C=84=EC=B9=AD=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 41e779e1a..da22210b8 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -134,9 +134,9 @@ jobs: run: | until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done - - name: Switch traffic to new environment - run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d --scale springboot-app=1 +# - name: Switch traffic to new environment +# run: | +# sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d --scale springboot-app=1 - name: Stop and remove the old environment run: | From 0e6a7b3a0521ffc0bbb76967e5c0ad08f113f068 Mon Sep 17 00:00:00 2001 From: Redddy <78539407+reddevilmidzy@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:41:19 +0900 Subject: [PATCH 19/33] =?UTF-8?q?fix:=20=ED=97=AC=EC=8A=A4=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=9D=91=EB=8B=B5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/site/coduo/common/controller/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index bc4b16862..c38f4fb62 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -8,7 +8,7 @@ public class CommonController { @GetMapping("/health-check") public String healthCheck() { - return "Coduo is OK"; + return "Coduo is OK!"; } @GetMapping("/help") From f8c9098a2bb267dfd040242b1b516525ba4c8883 Mon Sep 17 00:00:00 2001 From: fram1998 Date: Fri, 18 Oct 2024 18:50:34 +0900 Subject: [PATCH 20/33] =?UTF-8?q?chore:=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EC=A0=84=20=EB=8F=84=EC=BB=A4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index da22210b8..b441b40ec 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -126,6 +126,10 @@ jobs: # echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV # echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV + - name: remove old spring-app image + run: | + sudo docker image rm -f coduo2024/springboot-app; + - name: Start the new (green/blue) environment run: | sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d From 3651a1a4bb73b938901bd3e63b2ed6b6468fc4d0 Mon Sep 17 00:00:00 2001 From: fram1998 Date: Fri, 18 Oct 2024 18:51:06 +0900 Subject: [PATCH 21/33] =?UTF-8?q?chore:=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EC=A0=84=20=EB=8F=84=EC=BB=A4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 4 ++-- backend/be_app-docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index b441b40ec..d2684c234 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -40,8 +40,8 @@ jobs: - name: Image build and push run: | - docker build --build-arg PROFILE=test --build-arg DEPENDENCY=build/dependency -t ${{ secrets.DOCKER_REPO_NAME }}/springboot-app:test-latest --platform linux/arm64 . - docker push ${{ secrets.DOCKER_REPO_NAME }}/springboot-app:test-latest + docker build --build-arg PROFILE=test --build-arg DEPENDENCY=build/dependency -t ${{ secrets.DOCKER_REPO_NAME }}/springboot-app --platform linux/arm64 . + docker push ${{ secrets.DOCKER_REPO_NAME }}/springboot-app - name: Upload docker-compose yaml script to artifact uses: actions/upload-artifact@v4 diff --git a/backend/be_app-docker-compose.yml b/backend/be_app-docker-compose.yml index 34b00cbba..f6e3dcb21 100644 --- a/backend/be_app-docker-compose.yml +++ b/backend/be_app-docker-compose.yml @@ -1,7 +1,7 @@ services: springboot-green: container_name: coduo_springboot-app-${GREEN_SERVER_BINDING_PORT} - image: ${DOCKER_REPO_NAME}/springboot-app:test-latest + image: ${DOCKER_REPO_NAME}/springboot-app platform: linux/arm64 ports: - "${GREEN_SERVER_BINDING_PORT}:${GREEN_SERVER_BINDING_PORT}" From 14c3a02ad99c72dbfdcd9096253ef1126389c5c6 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Fri, 18 Oct 2024 20:22:09 +0900 Subject: [PATCH 22/33] =?UTF-8?q?chore:=20CD=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index d2684c234..f305799dc 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -107,41 +107,18 @@ jobs: SERVER_LOGS_PATH=${{ secrets.SERVER_LOGS_PATH }} EOF - #- name: Stop and remove existing containers - #run: | - # sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml down --rmi all - #- name: Deploy docker container - #run: | - # sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml up -d - - # 실행중인 서버 확인 -# - name: Determine Active and Inactive Ports (Blue/Green) -# id: determine-ports -# run: | -# echo $(pwd) -# chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 -# echo chmod ok -# source ./deploy.sh -# echo source ok -# echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV -# echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV + - name: Start the new (green/blue) environment + run: | + sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d - name: remove old spring-app image run: | sudo docker image rm -f coduo2024/springboot-app; - - name: Start the new (green/blue) environment - run: | - sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d - - name: Wait for new environment to be healthy run: | until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done -# - name: Switch traffic to new environment -# run: | -# sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $GREEN_PORT up -d --scale springboot-app=1 - - name: Stop and remove the old environment run: | sudo docker-compose --env-file ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/.be_app-env -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/be_app-docker-compose.yml -p $BLUE_PORT down From 3cc2e6cc30943735b7d22fdb97aabebd88add74c Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Fri, 18 Oct 2024 20:25:44 +0900 Subject: [PATCH 23/33] =?UTF-8?q?style:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/site/coduo/common/controller/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index c38f4fb62..b96c06e22 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -13,6 +13,6 @@ public String healthCheck() { @GetMapping("/help") public String help() { - return "불쌍한 켈리를 살려주세요..."; + return "help me"; } } From d9ef5f1b926754abe3ff2916e8c33f7951721d94 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Fri, 18 Oct 2024 20:30:49 +0900 Subject: [PATCH 24/33] =?UTF-8?q?fix:=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=8C=80=EA=B8=B0=EB=A5=BC=20=EB=8F=84?= =?UTF-8?q?=EC=BB=A4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=8C=80=EC=8B=A0=20?= =?UTF-8?q?http=20=EC=9A=94=EC=B2=AD=EC=9C=BC=EB=A1=9C=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index f305799dc..c5b985a9b 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -117,7 +117,8 @@ jobs: - name: Wait for new environment to be healthy run: | - until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done + until curl -sf http://localhost:${GREEN_PORT}/actuator/health | grep "UP"; do sleep 5; done +# until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done - name: Stop and remove the old environment run: | From bb24a9f877f9bcbef8882125b20773da8a7f9135 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Fri, 18 Oct 2024 20:33:50 +0900 Subject: [PATCH 25/33] =?UTF-8?q?fix:=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=8C=80=EA=B8=B0=EB=A5=BC=20=EB=8F=84?= =?UTF-8?q?=EC=BB=A4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=8C=80=EC=8B=A0=20?= =?UTF-8?q?http=20=EC=9A=94=EC=B2=AD=EC=9C=BC=EB=A1=9C=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20/api=20=ED=94=84=EB=A6=AC=ED=94=BD=EC=8A=A4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 2 +- .../java/site/coduo/common/controller/CommonController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index c5b985a9b..8abfe5834 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -117,7 +117,7 @@ jobs: - name: Wait for new environment to be healthy run: | - until curl -sf http://localhost:${GREEN_PORT}/actuator/health | grep "UP"; do sleep 5; done + until curl -sf http://localhost:${GREEN_PORT}/api/actuator/health | grep "UP"; do sleep 5; done # until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done - name: Stop and remove the old environment diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index b96c06e22..b90469982 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -13,6 +13,6 @@ public String healthCheck() { @GetMapping("/help") public String help() { - return "help me"; + return "에휴"; } } From 8c56dc6c9b36f065431815a00e35ed209a788c99 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Fri, 18 Oct 2024 21:32:32 +0900 Subject: [PATCH 26/33] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=EC=84=9C=20nginx=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 6 +++++- .../java/site/coduo/common/controller/CommonController.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 8abfe5834..2aee0bb8f 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -118,7 +118,11 @@ jobs: - name: Wait for new environment to be healthy run: | until curl -sf http://localhost:${GREEN_PORT}/api/actuator/health | grep "UP"; do sleep 5; done -# until sudo docker inspect --format '{{json .State.Status}}' coduo_springboot-app-${GREEN_PORT} | grep "running"; do sleep 5; done + + - name: Switch NGINX to Green Port + run: | + sudo sed -i "s/listen 808[01];/listen ${GREEN_PORT};/" /etc/nginx/nginx.conf + sudo systemctl reload nginx - name: Stop and remove the old environment run: | diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index b90469982..04577e1bc 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -13,6 +13,6 @@ public String healthCheck() { @GetMapping("/help") public String help() { - return "에휴"; + return "끼욧"; } } From 72e6ef24c167915c739a66bbe86002cd8846571a Mon Sep 17 00:00:00 2001 From: Redddy <78539407+reddevilmidzy@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:39:38 +0900 Subject: [PATCH 27/33] =?UTF-8?q?style:=20=ED=97=AC=EC=8A=A4=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=9D=91=EB=8B=B5=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/site/coduo/common/controller/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index 04577e1bc..6ac3a176e 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -13,6 +13,6 @@ public String healthCheck() { @GetMapping("/help") public String help() { - return "끼욧"; + return "끼욧!!"; } } From 07a6f53ef80b18c3b4abbf2892039a0c2e548879 Mon Sep 17 00:00:00 2001 From: Redddy <78539407+reddevilmidzy@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:43:06 +0900 Subject: [PATCH 28/33] =?UTF-8?q?chore:=20CD=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index 2aee0bb8f..bc4c17dd4 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -119,9 +119,8 @@ jobs: run: | until curl -sf http://localhost:${GREEN_PORT}/api/actuator/health | grep "UP"; do sleep 5; done - - name: Switch NGINX to Green Port + - name: Reload NGINX run: | - sudo sed -i "s/listen 808[01];/listen ${GREEN_PORT};/" /etc/nginx/nginx.conf sudo systemctl reload nginx - name: Stop and remove the old environment From 09307488120ea272762ffcf08b228a2bcafffcd4 Mon Sep 17 00:00:00 2001 From: Redddy <78539407+reddevilmidzy@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:44:21 +0900 Subject: [PATCH 29/33] =?UTF-8?q?style:=20=ED=97=AC=EC=8A=A4=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=9D=91=EB=8B=B5=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/site/coduo/common/controller/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/site/coduo/common/controller/CommonController.java b/backend/src/main/java/site/coduo/common/controller/CommonController.java index 6ac3a176e..52babbe25 100644 --- a/backend/src/main/java/site/coduo/common/controller/CommonController.java +++ b/backend/src/main/java/site/coduo/common/controller/CommonController.java @@ -13,6 +13,6 @@ public String healthCheck() { @GetMapping("/help") public String help() { - return "끼욧!!"; + return "히히"; } } From 2fd6cfd6fbeae5f6ce2fb9f9c30121bf887fbc7e Mon Sep 17 00:00:00 2001 From: Redddy <78539407+reddevilmidzy@users.noreply.github.com> Date: Sat, 19 Oct 2024 18:52:32 +0900 Subject: [PATCH 30/33] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be_cd-test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/be_cd-test.yml b/.github/workflows/be_cd-test.yml index bc4c17dd4..ae068096e 100644 --- a/.github/workflows/be_cd-test.yml +++ b/.github/workflows/be_cd-test.yml @@ -69,11 +69,9 @@ jobs: - name: Extract secrets as .be_app-env file run: | - echo $(pwd) - chmod +x ./deploy.sh # 스크립트에 실행 권한 부여 - echo chmod ok + chmod +x ./deploy.sh source ./deploy.sh - echo source ok + echo "BLUE_PORT=$BLUE_PORT" >> $GITHUB_ENV echo "GREEN_PORT=$GREEN_PORT" >> $GITHUB_ENV From 6fc0be99451f9fa09ed12bb4802ecb7fef40113e Mon Sep 17 00:00:00 2001 From: fram1998 Date: Sun, 20 Oct 2024 16:46:24 +0900 Subject: [PATCH 31/33] =?UTF-8?q?docs:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?= =?UTF-8?q?=EB=AC=B8=EC=84=9C=ED=99=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/site/coduo/todo/controller/docs/TodoDocs.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/site/coduo/todo/controller/docs/TodoDocs.java b/backend/src/main/java/site/coduo/todo/controller/docs/TodoDocs.java index 46d1aa0e6..a68cb8d57 100644 --- a/backend/src/main/java/site/coduo/todo/controller/docs/TodoDocs.java +++ b/backend/src/main/java/site/coduo/todo/controller/docs/TodoDocs.java @@ -57,6 +57,7 @@ ResponseEntity updateTodoOrder( ); @Operation(summary = "투두를 삭제한다.") + @ApiResponse(responseCode = "204", description = "투두 삭제 성공") ResponseEntity deleteTodo( @Parameter(description = "삭제할 투두 id") @PathVariable("todoId") final long todoId From b63f8987f79a02999a12b68da8a781f5945d1e33 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Sun, 20 Oct 2024 17:54:29 +0900 Subject: [PATCH 32/33] =?UTF-8?q?docs:=20=EC=9D=91=EB=8B=B5=EC=9D=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20@Ar?= =?UTF-8?q?raySchema=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/coduo/pairroom/controller/docs/PairRoomDocs.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java b/backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java index af71bc5e6..1e44d02ca 100644 --- a/backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java +++ b/backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -58,8 +59,8 @@ ResponseEntity updatePairRoomStatus( ); @Operation(summary = "자신의 페어룸을 조회한다.") - @ApiResponse(responseCode = "200", description = "페어룸 조회 성공", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, - schema = @Schema(implementation = PairRoomMemberResponse.class))) + @ApiResponse(responseCode = "200", description = "페어룸 조회 성공", content = @Content( + array = @ArraySchema(schema = @Schema(implementation = PairRoomMemberResponse.class)))) ResponseEntity> getPairRooms( @Parameter( in = ParameterIn.COOKIE, @@ -74,7 +75,7 @@ ResponseEntity> getPairRooms( @ApiResponse(responseCode = "200", description = "페어룸 존재 여부", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = PairRoomExistResponse.class))) ResponseEntity pairRoomExists(String accessCode); - + @Operation(summary = "페어룸을 삭제한다.") @ApiResponse(responseCode = "204", description = "페어룸 삭제 성공") ResponseEntity deletePairRoom( From 025d7a85fe7e256629c73657b9110e1569beff84 Mon Sep 17 00:00:00 2001 From: fram1998 Date: Sun, 20 Oct 2024 18:47:54 +0900 Subject: [PATCH 33/33] =?UTF-8?q?docs:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?= =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coduo/member/controller/docs/AuthControllerDocs.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/site/coduo/member/controller/docs/AuthControllerDocs.java b/backend/src/main/java/site/coduo/member/controller/docs/AuthControllerDocs.java index e5ce6adcd..cfbe4825e 100644 --- a/backend/src/main/java/site/coduo/member/controller/docs/AuthControllerDocs.java +++ b/backend/src/main/java/site/coduo/member/controller/docs/AuthControllerDocs.java @@ -19,9 +19,8 @@ @Tag(name = "인증/인가 API") public interface AuthControllerDocs { - @Operation(summary = "로그아웃 요청을 한다..") - @ApiResponse(responseCode = "200", description = "회원 정보(유저이름)을 등록한다.", content - = @Content(schema = @Schema(contentMediaType = MediaType.APPLICATION_JSON_VALUE))) + @Operation(summary = "로그아웃 요청을 한다.") + @ApiResponse(responseCode = "200", description = "로그아웃 요청 성공.") @ApiResponse(responseCode = "401", description = "인증 실패", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = ApiErrorResponse.class)))