Skip to content

Commit

Permalink
fix(#151): test deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
mjh000526 committed Dec 3, 2024
1 parent 856dc41 commit 6e0f55d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/be-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

#이미지 이름 저장
- name: Set Docker image tag as a variable
run: echo "DOCKER_TAG=${{ secrets.DOCKER_USERNAME }}/froxy-server:latest" >> $GITHUB_ENV
run: echo "DOCKER_TAG=${{ secrets.DOCKER_USERNAME }}/froxy-server:always" >> $GITHUB_ENV

- name: Create .env file
run: |
Expand All @@ -47,12 +47,12 @@ jobs:
- name: Deploy
run: |
ssh -o StrictHostKeyChecking=no [email protected] "
if [ \$(docker ps -a -q -f name=froxy-container) ]; then
docker stop froxy-container
docker rm froxy-container
if [ \$(docker ps -a -q -f name=froxy-always) ]; then
docker stop froxy-always
docker rm froxy-always
fi
docker pull ${{ secrets.DOCKER_USERNAME }}/froxy-server:latest && \
docker run --network host -d --name froxy-container -v /var/run/docker.sock:/var/run/docker.sock ${{ secrets.DOCKER_USERNAME }}/froxy-server:latest
docker pull ${{ secrets.DOCKER_USERNAME }}/froxy-server:always && \
docker run --network host -d --name froxy-always -v /var/run/docker.sock:/var/run/docker.sock ${{ secrets.DOCKER_USERNAME }}/froxy-server:always
docker image prune -f
"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ WORKDIR /app/apps/backend
CMD ["pnpm", "run", "start:prod"]

# 외부에서 접근할 수 있도록 포트 노출
EXPOSE 3000
EXPOSE 3001
6 changes: 3 additions & 3 deletions apps/backend/src/config/typeorm.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const typeORMConfig = async (configService: ConfigService): Promise<TypeO
username: configService.get<string>('MYSQL_USER'),
password: configService.get<string>('MYSQL_PASSWORD'),
database: configService.get<string>('MYSQL_DATABASE'),
entities: [User, Lotus, Comment, Tag, History, LotusTag],
dropSchema: true,
synchronize: true //todo: env로 release에서는 false가 되도록 해야함
entities: [User, Lotus, Comment, Tag, History, LotusTag]
//dropSchema: true,
//synchronize: true //todo: env로 release에서는 false가 되도록 해야함
});
2 changes: 1 addition & 1 deletion apps/backend/src/docker/docker.consumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface GistFile {
attr: GistFileAttributes;
}

@Processor('docker-queue')
@Processor('always-queue')
@Injectable()
export class DockerConsumer {
queue_num = false;
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/docker/docker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { GistModule } from '@/gist/gist.module';
imports: [
GistModule,
BullModule.registerQueue({
name: 'docker-queue'
name: 'always-queue'
})
],
controllers: [DockerController],
Expand Down
4 changes: 2 additions & 2 deletions apps/backend/src/docker/docker.pool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class DockerContainerPool implements OnApplicationBootstrap {
const containersToDelete = await this.docker.listContainers({ all: true });
await Promise.all(
containersToDelete
.filter((container) => container.Names.some((name) => name.startsWith('/froxy-run')))
.filter((container) => container.Names.some((name) => name.startsWith('/always')))
.map(async (container) => {
const removeContainer = await this.docker.getContainer(container.Id);
await removeContainer.remove({ force: true });
Expand Down Expand Up @@ -55,7 +55,7 @@ export class DockerContainerPool implements OnApplicationBootstrap {
'NODE_DISABLE_COLORS=true', // 색상 비활성화
'TERM=dumb' // dumb 터미널로 설정하여 색상 비활성화
],
name: `froxy-run${i + 1}`,
name: `always${i + 1}`,
HostConfig: {
Memory: (1024 * 1024 * 1024) / 2, // 1GB 메모리 제한
MemorySwap: (1024 * 1024 * 1024) / 2, // swap 메모리도 1GB로 설정
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/docker/docker.producer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DockerContainerPool } from './docker.pool';
export class DockerProducer implements OnApplicationBootstrap {
cnt = 0;
constructor(
@InjectQueue('docker-queue')
@InjectQueue('always-queue')
private readonly dockerQueue: Queue,
private dockerContainerPool: DockerContainerPool
) {}
Expand Down

0 comments on commit 6e0f55d

Please sign in to comment.