Skip to content

Commit

Permalink
Merge pull request #411 from boostcampwm2023/server/fix/409
Browse files Browse the repository at this point in the history
도커 브릿지 추가
  • Loading branch information
sk000801 authored Feb 19, 2024
2 parents c513dc1 + 29df902 commit 9467057
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion server/deploy-spring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/nest/src/app.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
});
2 changes: 1 addition & 1 deletion server/nest/src/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common';
@Injectable()
export class AppService {
getHello(): string {
return 'Catchy Tape!';
return 'Hello Catchy Tape';
}
}

0 comments on commit 9467057

Please sign in to comment.