nodebbs 0.3.0-beta.0 → 0.3.0-beta.3

package/dist/templates/docker-compose.lowmem.yml

@@ -6,7 +6,7 @@ services:
   # PostgreSQL - 低内存优化
   postgres:
     restart: always
-    ports: []
+
     deploy:
       resources:
         limits:
@@ -24,7 +24,7 @@ services:
   # Redis - 低内存优化
   redis:
     restart: always
-    ports: []
+
     command: >
       redis-server
       --requirepass ${REDIS_PASSWORD:-redis_password}

package/dist/templates/docker-compose.ports.yml

@@ -0,0 +1,8 @@
+services:
+  postgres:
+    ports:
+      - "${POSTGRES_PORT:-5432}:5432"
+
+  redis:
+    ports:
+      - "${REDIS_PORT:-6379}:6379"

package/dist/templates/docker-compose.prod.yml

@@ -6,7 +6,7 @@ services:
   # PostgreSQL - 生产环境安全与资源优化
   postgres:
     restart: always
-    ports: []  # 安全：不暴露端口到主机
+
     deploy:
       resources:
         limits:
@@ -24,7 +24,7 @@ services:
   # Redis - 生产环境安全与资源优化
   redis:
     restart: always
-    ports: []  # 安全：不暴露端口到主机
+
     command: >
       redis-server
       --requirepass ${REDIS_PASSWORD}

package/dist/templates/docker-compose.yml

@@ -1,3 +1,5 @@
+name: nodebbs
+
 services:
   # PostgreSQL 数据库
   postgres:
@@ -12,8 +14,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
 
-    ports:
-      - "${POSTGRES_PORT:-5432}:5432"
+
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
@@ -32,8 +33,7 @@ services:
       TZ: Asia/Shanghai
     volumes:
       - redis_data:/data
-    ports:
-      - "${REDIS_PORT:-6379}:6379"
+
     healthcheck:
       test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
       interval: 10s
@@ -96,6 +96,11 @@ services:
       PORT: 3100
       SERVER_API_URL: ${SERVER_API_URL:-http://api:7100}
       TZ: Asia/Shanghai
+    # volumes:
+      # 自定义资源挂载（如有需要，请取消注释并在同级目录下创建 web 文件夹及对应文件）
+      # - ./web/favicon.ico:/app/apps/web/public/favicon.ico
+      # - ./web/logo.svg:/app/apps/web/public/logo.svg
+      # - ./web/apple-touch-icon.png:/app/apps/web/public/apple-touch-icon.png
     ports:
       - "${WEB_PORT:-3100}:3100"
     depends_on:

package/dist/utils/docker.js

@@ -31,6 +31,7 @@ export async function getComposeFiles(env) {
     // 1. 确定 Base 文件
     // 检查当前目录是否存在 docker-compose.yml
     let baseFile = path.join(workDir, 'docker-compose.yml');
+    // 2. 确定构建配置 (仅源码模式)和环境 Override
     const templateDir = getTemplateDir();
     if (!await fileExists(baseFile)) {
         // 使用内置模板
@@ -38,19 +39,26 @@ export async function getComposeFiles(env) {
         baseFile = getTemplatePath('docker-compose.yml');
     }
     const files = [baseFile];
-    // 2. 确定环境 Override 文件 (production / lowmem)
-    if (env === 'production' || env === 'lowmem') {
-        const fileName = `docker-compose.${env}.yml`;
+    // 映射 environment 到对应的 override 文件名
+    const envFileMap = {
+        'production': 'docker-compose.prod.yml',
+        'lowmem': 'docker-compose.lowmem.yml',
+        'basic': 'docker-compose.ports.yml'
+    };
+    if (env in envFileMap) {
+        const fileName = envFileMap[env];
+        // 注意：basic 对应的 ports.yml 是新增的，可能不存在于旧项目的根目录，
+        // 但如果是在 CLI 内部运行，templateDir 里肯定有。
+        // 如果是 production/lowmem，用户目录可能有 override。
         const localOverride = path.join(workDir, fileName);
         const templateOverride = path.join(templateDir, fileName);
+        // 策略调整：
+        // basic -> 总是尝试加载 ports.yml (通常只存在于 template，或者用户没覆盖)
+        // production/lowmem -> 尝试加载对应的 override
         if (await fileExists(localOverride)) {
             files.push(localOverride);
         }
         else if (await fileExists(templateOverride)) {
-            // 即使 Base 是本地的，如果本地没有 override，我们也尝试用内置的 override 补全吗？
-            // 通常为了混用方便，是可以的。但如果 Base 是本地，通常期望全套本地。
-            // 策略：如果 Base 是内置，则一定用内置 Override。如果 Base 是本地，仅当本地也有 Override 时才用？
-            // 不，为了方便用户只覆盖 Base 而复用我们的资源配置，如果本地没 Override，可以用内置的。
             files.push(templateOverride);
         }
     }

package/oclif.manifest.json

@@ -245,6 +245,37 @@
         "seed.js"
       ]
     },
+    "pack": {
+      "aliases": [],
+      "args": {},
+      "description": "生成离线部署包",
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "输出文件名",
+          "name": "output",
+          "default": "nodebbs-offline.tar.gz",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "pack",
+      "pluginAlias": "nodebbs",
+      "pluginName": "nodebbs",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "pack",
+        "index.js"
+      ]
+    },
     "logs:all": {
       "aliases": [],
       "args": {},
@@ -420,37 +451,6 @@
         "web.js"
       ]
     },
-    "pack": {
-      "aliases": [],
-      "args": {},
-      "description": "生成离线部署包",
-      "flags": {
-        "output": {
-          "char": "o",
-          "description": "输出文件名",
-          "name": "output",
-          "default": "nodebbs-offline.tar.gz",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "pack",
-      "pluginAlias": "nodebbs",
-      "pluginName": "nodebbs",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "pack",
-        "index.js"
-      ]
-    },
     "restart": {
       "aliases": [],
       "args": {},
@@ -781,5 +781,5 @@
       ]
     }
   },
-  "version": "0.3.0-beta.0"
+  "version": "0.3.0-beta.3"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodebbs",
   "description": "NodeBBS 论坛系统专业运维工具",
-  "version": "0.3.0-beta.0",
+  "version": "0.3.0-beta.3",
   "author": "wengqianshan",
   "bin": {
     "nodebbs": "./bin/run.js"