From 22292014c11e794d2990fcdba0325dbe9315f9c8 Mon Sep 17 00:00:00 2001 From: seokyung Date: Mon, 19 Feb 2024 15:39:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=EB=B8=8C=EB=A6=BF=EC=A7=80=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * redis 연결 오류에 따른 bridge 추가 --- server/deploy-spring.sh | 2 +- server/deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/deploy-spring.sh b/server/deploy-spring.sh index dca2d14..77713d5 100644 --- a/server/deploy-spring.sh +++ b/server/deploy-spring.sh @@ -23,7 +23,7 @@ fi # 1 새로운 서버를 띄운다 docker login $NCP_SPRING_REGISTRY -u $NCP_DOCKER_ACCESS_KEY_ID -p $NCP_DOCKER_SECRET_KEY docker pull $NCP_SPRING_REGISTRY/catchy-tape-sub:latest -docker run -v /home/hyung/logs:/catchy-tape-sub/logs -d -p $WEB_SERVER_TARGET_PORT:8080 --name $TARGET_SERVER_NAME $NCP_SPRING_REGISTRY/catchy-tape-sub:latest +docker run -v /home/hyung/logs:/catchy-tape-sub/logs -d --net redis-bridge -p $WEB_SERVER_TARGET_PORT:8080 --name $TARGET_SERVER_NAME $NCP_SPRING_REGISTRY/catchy-tape-sub:latest # 2 nginx 포트 설정 변경 후 reload NGINX_CONFIG="/etc/nginx/nginx.conf" diff --git a/server/deploy.sh b/server/deploy.sh index 91e838e..e6d6f01 100644 --- a/server/deploy.sh +++ b/server/deploy.sh @@ -23,7 +23,7 @@ fi # 1 새로운 서버를 띄운다 docker login $NCP_REGISTRY -u $NCP_DOCKER_ACCESS_KEY_ID -p $NCP_DOCKER_SECRET_KEY docker pull $NCP_REGISTRY/catchy-tape:latest -docker run -v /home/hyung/logs:/catchy-tape/logs -d -p $WEB_SERVER_TARGET_PORT:3000 --name $TARGET_SERVER_NAME $NCP_REGISTRY/catchy-tape:latest +docker run -v /home/hyung/logs:/catchy-tape/logs -d --net redis-bridge -p $WEB_SERVER_TARGET_PORT:3000 --name $TARGET_SERVER_NAME $NCP_REGISTRY/catchy-tape:latest # 2 nginx 포트 설정 변경 후 reload NGINX_CONFIG="/etc/nginx/nginx.conf" From b3a81bdaba5842e4ebe50d8557ef596cd336fc0f Mon Sep 17 00:00:00 2001 From: seokyung Date: Mon, 19 Feb 2024 15:40:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore=20:=20CD=20=EC=9E=91=EB=8F=99?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/nest/src/app.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/nest/src/app.service.ts b/server/nest/src/app.service.ts index 6af0e16..2ee7c44 100644 --- a/server/nest/src/app.service.ts +++ b/server/nest/src/app.service.ts @@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common'; @Injectable() export class AppService { getHello(): string { - return 'Catchy Tape!'; + return 'Hello Catchy Tape'; } } From 29df90282f6a709d14ab83c2dcf07d0235529b93 Mon Sep 17 00:00:00 2001 From: seokyung Date: Mon, 19 Feb 2024 15:43:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/nest/src/app.controller.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/nest/src/app.controller.spec.ts b/server/nest/src/app.controller.spec.ts index 1a80a78..6db80dd 100644 --- a/server/nest/src/app.controller.spec.ts +++ b/server/nest/src/app.controller.spec.ts @@ -16,7 +16,7 @@ describe('AppController', () => { describe('root', () => { it('should return "Hello World!"', () => { - expect(appController.getHello()).toBe('Catchy Tape!'); + expect(appController.getHello()).toBe('Hello Catchy Tape'); }); }); });