fix: 브랜치 병합 충돌 문제 해결

Author: fru1tworld

docker-compose.override.yml

@@ -118,58 +118,6 @@ services:
       - LOG_LEVEL=debug
     networks:
       - app-network
-  api:
-    build:
-      context: .
-      dockerfile: ./packages/api/Dockerfile
-    container_name: api
-    ports:
-      - "3000:3000"
-    depends_on:
-      mysql:
-        condition: service_healthy
-      mongodb:
-        condition: service_healthy
-    environment:
-      - MYSQL_HOST=mysql-container
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=dev_db
-      - MYSQL_PASSWORD=1234
-      - MYSQL_USER=honey
-      - NODE_ENV=dev
-      - MONGO_HOST=mongodb-container
-      - MONGO_USER=honey
-      - MONGO_PASSWORD=1234
-      - MONGO_DB=dev_db
-      - LOG_LEVEL=info
-    networks:
-      - app-network
-  api:
-    build:
-      context: .
-      dockerfile: ./packages/api/Dockerfile
-    container_name: api
-    ports:
-      - "3000:3000"
-    depends_on:
-      mysql:
-        condition: service_healthy
-      mongodb:
-        condition: service_healthy
-    environment:
-      - MYSQL_HOST=mysql-container
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=dev_db
-      - MYSQL_PASSWORD=1234
-      - MYSQL_USER=honey
-      - NODE_ENV=dev
-      - MONGO_HOST=mongodb-container
-      - MONGO_USER=honey
-      - MONGO_PASSWORD=1234
-      - MONGO_DB=dev_db
-      - LOG_LEVEL=info
-    networks:
-      - app-network
 
   load-balancer:
     build:
@@ -203,7 +151,6 @@ services:
       collaborative_room1:
         condition: service_started
       collaborative_room2:
-
         condition: service_started
       api:
         condition: service_started

docker-compose.yml

@@ -1,43 +1,43 @@
-services:
-  api:
-    build:
-      context: .
-      dockerfile: ./packages/api
-    restart: unless-stopped
-    networks:
-      - app-network
+# services:
+#   api:
+#     build:
+#       context: .
+#       dockerfile: ./packages/api
+#     restart: unless-stopped
+#     networks:
+#       - app-network
 
-  load-balancer:
-    build:
-      context: .
-      dockerfile: ./packages/loadbalancer
-    restart: unless-stopped
-    networks:
-      - app-network
+#   load-balancer:
+#     build:
+#       context: .
+#       dockerfile: ./packages/loadbalancer
+#     restart: unless-stopped
+#     networks:
+#       - app-network
 
-  collaborative-room1:
-    build:
-      context: .
-      dockerfile: ./packages/collaborative
-    restart: unless-stopped
-    networks:
-      - app-network
+#   collaborative-room1:
+#     build:
+#       context: .
+#       dockerfile: ./packages/collaborative
+#     restart: unless-stopped
+#     networks:
+#       - app-network
 
-  collaborative-room2:
-    build:
-      context: .
-      dockerfile: ./packages/collaborative
-    restart: unless-stopped
-    networks:
-      - app-network
+#   collaborative-room2:
+#     build:
+#       context: .
+#       dockerfile: ./packages/collaborative
+#     restart: unless-stopped
+#     networks:
+#       - app-network
 
-  frontend:
-    build:
-      context: .
-      dockerfile: ./packages/frontend
-    restart: unless-stopped
-    networks:
-      - app-network
+#   frontend:
+#     build:
+#       context: .
+#       dockerfile: ./packages/frontend
+#     restart: unless-stopped
+#     networks:
+#       - app-network
 
 networks:
   app-network: