Merge pull request #11 from boostcampwm-2024/refactor-be-#4

ezcolin2 · web-flow · commit a611c67c1ed7 · 2025-01-09T16:50:07.000+09:00
refactor: 도커 최적화 - 중복되는 볼륨 처리
diff --git a/compose.local.yml b/compose.local.yml
@@ -1,119 +1,126 @@
 version: "3.8"
 
 services:
-    postgres:
-        image: postgres:16-alpine
-        environment:
-            POSTGRES_USER: ${DB_USER}
-            POSTGRES_PASSWORD: ${DB_PASSWORD}
-            POSTGRES_DB: ${DB_NAME}
-        volumes:
-            - postgres_data:/var/lib/postgresql/data
-        networks:
-            - net
-        healthcheck:
-            test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        ports:
-            - "5432:5432"
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_NAME}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - net
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    ports:
+      - "5432:5432"
 
-    redis:
-        image: redis:latest
-        environment:
-            REDIS_HOST: ${REDIS_HOST}
-            REDIS_PORT: ${REDIS_PORT}
-        networks:
-            - net
-        ports:
-            - "6379:6379"
-        healthcheck:
-            test: ["CMD", "redis-cli", "ping"]
-            interval: 30s
-            retries: 3
-            start_period: 10s
-            timeout: 5s
+  redis:
+    image: redis:latest
+    environment:
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PORT: ${REDIS_PORT}
+    networks:
+      - net
+    ports:
+      - "6379:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 30s
+      retries: 3
+      start_period: 10s
+      timeout: 5s
 
-    backend:
-        build:
-            context: .
-            dockerfile: ./services/backend/Dockerfile.local
-        image: backend:latest
-        env_file:
-            - .env
-        volumes:
-            - .env:/app/.env
-            # 소스 코드 마운트
-            - ./apps/backend:/app/apps/backend
-            - ./apps/frontend:/app/apps/frontend
-            # 의존성 캐시를 위한 볼륨
-            - backend_node_modules:/app/node_modules
-            - backend_app_node_modules:/app/apps/backend/node_modules
-            - frontend_app_node_modules:/app/apps/frontend/node_modules
-        depends_on:
-            postgres:
-                condition: service_healthy
-            redis:
-                condition: service_healthy
-        networks:
-            - net
-        ports:
-            - "5173:5173" # Vite dev server
-            - "3000:3000" # 백엔드 API 포트
+  backend:
+    build:
+      context: .
+      dockerfile: ./services/backend/Dockerfile.local
+    image: backend:latest
+    env_file:
+      - .env
+    volumes:
+      - .env:/app/.env
+      - ./apps/backend:/app/apps/backend
+      - ./apps/frontend:/app/apps/frontend
+      - root_node_modules:/app/node_modules
+      - backend_app_node_modules:/app/apps/backend/node_modules
+      - frontend_app_node_modules:/app/apps/frontend/node_modules
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - net
+    ports:
+      - "5173:5173" # Vite dev server
+      - "3000:3000" # 백엔드 API 포트
+    entrypoint: |
+      sh -c "
+      yarn install &&
+      yarn dev
+      "
 
-    websocket:
-        build:
-            context: .
-            dockerfile: ./services/websocket/Dockerfile.local
-        image: websocket:latest
-        env_file:
-            - .env
-        volumes:
-            - .env:/app/.env
-            # 소스 코드 마운트
-            - ./apps/websocket:/app/apps/websocket
-            # 의존성 캐시를 위한 볼륨
-            - websocket_node_modules:/app/node_modules
-            - websocket_app_node_modules:/app/apps/websocket/node_modules
-        depends_on:
-            postgres:
-                condition: service_healthy
-            redis:
-                condition: service_healthy
-        networks:
-            - net
-        ports:
-            - "4242:4242" # WebSocket 포트
+  websocket:
+    build:
+      context: .
+      dockerfile: ./services/websocket/Dockerfile.local
+    image: websocket:latest
+    env_file:
+      - .env
+    volumes:
+      - .env:/app/.env
+      - ./apps/websocket:/app/apps/websocket
+      - root_node_modules:/app/node_modules
+      - websocket_app_node_modules:/app/apps/websocket/node_modules
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - net
+    ports:
+      - "4242:4242" # WebSocket 포트
+    entrypoint: |
+      sh -c "
+      yarn install &&
+      yarn dev
+      "
 
-    nginx:
-        build:
-            context: .
-            dockerfile: ./services/nginx/Dockerfile.local
-        ports:
-            - "80:80"
-            - "443:443"
-        depends_on:
-            - backend
-            - websocket
-        networks:
-            - net
-        volumes:
-            - type: bind
-              source: ./services/nginx/ssl
-              target: /etc/nginx/ssl
-              bind:
-                  create_host_path: true
-                  propagation: rprivate
-            - ./services/nginx/conf.d:/etc/nginx/conf.d
+  nginx:
+    build:
+      context: .
+      dockerfile: ./services/nginx/Dockerfile.local
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - backend
+      - websocket
+    networks:
+      - net
+    volumes:
+      - type: bind
+        source: ./services/nginx/ssl
+        target: /etc/nginx/ssl
+        bind:
+          create_host_path: true
+          propagation: rprivate
+      - ./services/nginx/conf.d:/etc/nginx/conf.d
 
 networks:
-    net:
+  net:
 
 volumes:
-    postgres_data:
-    backend_node_modules:
-    backend_app_node_modules:
-    frontend_app_node_modules:
-    websocket_node_modules:
-    websocket_app_node_modules:
+  postgres_data:
+  root_node_modules:
+  backend_node_modules:
+  backend_app_node_modules:
+  frontend_app_node_modules:
+  websocket_node_modules:
+  websocket_app_node_modules:
diff --git a/package.json b/package.json
@@ -1,30 +1,30 @@
 {
-    "name": "octodocs",
-    "version": "1.0.0",
-    "main": "index.js",
-    "repository": "https://github.com/boostcampwm-2024/web15-OctoDocs.git",
-    "author": "ez <105545215+ezcolin2@users.noreply.github.com>",
-    "license": "MIT",
-    "scripts": {
-        "dev": "turbo run dev --parallel",
-        "build": "turbo run build",
-        "start": "node apps/backend/dist/main.js",
-        "start:backend": "node apps/backend/dist/main.js",
-        "start:websocket": "node apps/websocket/dist/main.js",
-        "lint": "turbo run lint",
-        "test": "turbo run test",
-        "docker:dev": "docker compose -f compose.local.yml up",
-        "docker:dev:down": "docker compose -f compose.local.yml down",
-        "docker:dev:clean": "docker compose -v -f compose.local.yml down",
-        "docker:dev:fclean": "docker compose -v -f compose.local.yml down --rmi all",
-        "ssl:generate": "cd services/nginx/ssl && bash ./generate-cert.sh"
-    },
-    "dependencies": {
-        "turbo": "^2.3.0"
-    },
-    "private": true,
-    "workspaces": [
-        "apps/*"
-    ],
-    "packageManager": "yarn@1.22.22"
+  "name": "octodocs",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "https://github.com/boostcampwm-2024/web15-OctoDocs.git",
+  "author": "ez <105545215+ezcolin2@users.noreply.github.com>",
+  "license": "MIT",
+  "scripts": {
+    "dev": "turbo run dev --parallel",
+    "build": "turbo run build",
+    "start": "node apps/backend/dist/main.js",
+    "start:backend": "node apps/backend/dist/main.js",
+    "start:websocket": "node apps/websocket/dist/main.js",
+    "lint": "turbo run lint",
+    "test": "turbo run test",
+    "docker:dev": "docker compose -f compose.local.yml up",
+    "docker:dev:down": "docker compose -f compose.local.yml down",
+    "docker:dev:clean": "docker compose -v -f compose.local.yml down",
+    "docker:dev:fclean": "docker compose -v -f compose.local.yml down --rmi all",
+    "ssl:generate": "cd services/nginx/ssl && bash ./generate-cert.sh"
+  },
+  "dependencies": {
+    "turbo": "^2.3.0"
+  },
+  "private": true,
+  "workspaces": [
+    "apps/*"
+  ],
+  "packageManager": "yarn@1.22.22"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -9999,7 +9999,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10031,7 +10040,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10979,7 +10995,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10997,6 +11013,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
