Merge branch 'main' of https://github.com/boostcampwm-2024/web38-Froxy …

…into feature-#204-mocking

.github/workflows/be-cd.yml

@@ -51,7 +51,7 @@ jobs:
               docker rm froxy-container
             fi
             docker pull ${{ secrets.DOCKER_USERNAME }}/froxy-server:latest && \
-            docker run --network froxy-network -d --name froxy-container -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock ${{ 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 image prune -f
             "
           

.github/workflows/fe-cd.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - deploy
-
 jobs:
   fe-cd:
     runs-on: ubuntu-20.04

apps/backend/src/config/queue.config.ts

@@ -1,10 +1,10 @@
-import { BullRootModuleOptions } from '@nestjs/bull';
-import { ConfigService } from '@nestjs/config';
-
-export const queueConfig = (configService: ConfigService): BullRootModuleOptions => ({
-  redis: {
-    host: configService.get<string>('REDIS_HOST', { infer: true }),
-    port: configService.get<number>('REDIS_PORT', { infer: true }),
-    password: configService.get<string>('REDIS_PASSWORD', { infer: true })
-  }
-});
+import { BullRootModuleOptions } from '@nestjs/bull';
+import { ConfigService } from '@nestjs/config';
+
+export const queueConfig = (configService: ConfigService): BullRootModuleOptions => ({
+  redis: {
+    host: configService.get<string>('REDIS_HOST', { infer: true }),
+    port: configService.get<number>('REDIS_PORT', { infer: true }),
+    password: configService.get<string>('REDIS_PASSWORD', { infer: true })
+  }
+});

apps/backend/src/config/typeorm.config.ts

@@ -15,5 +15,6 @@ export const typeORMConfig = async (configService: ConfigService): Promise<TypeO
   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가 되도록 해야함
 });

apps/backend/src/constants/constants.ts

@@ -1,19 +1,19 @@
-export const GIST_AUTH_HEADER = (gitToken: string = null) => {
-  return {
-    Accept: 'application/vnd.github+json',
-    Authorization: `Bearer ${gitToken}`,
-    'X-GitHub-Api-Version': '2022-11-28',
-    'Content-Type': 'application/json'
-  };
-};
-export enum HISTORY_STATUS {
-  PENDING = 'PENDING',
-  ERROR = 'ERROR',
-  SUCCESS = 'SUCCESS'
-}
-
-export enum SUPPORTED_LANGUAGES {
-  JS = '.js'
-}
-
-export const MAX_CONTAINER_CNT = 6;
+export const GIST_AUTH_HEADER = (gitToken: string = null) => {
+  return {
+    Accept: 'application/vnd.github+json',
+    Authorization: `Bearer ${gitToken}`,
+    'X-GitHub-Api-Version': '2022-11-28',
+    'Content-Type': 'application/json'
+  };
+};
+export enum HISTORY_STATUS {
+  PENDING = 'PENDING',
+  ERROR = 'ERROR',
+  SUCCESS = 'SUCCESS'
+}
+
+export enum SUPPORTED_LANGUAGES {
+  JS = '.js'
+}
+
+export const MAX_CONTAINER_CNT = 10;