@nocobase/cli 2.2.0-alpha.4 → 2.2.0-alpha.5

package/dist/commands/install.js

@@ -13,11 +13,11 @@ import path from 'node:path';
 import { exit } from 'node:process';
 import { appendAppPublicPath } from '../lib/app-public-path.js';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, localeText, resolveCliLocale, translateCli } from "../lib/cli-locale.js";
+import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRoot, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { defaultDockerContainerPrefix, defaultDockerNetworkName, managedAppLifecycleEnvVars, } from '../lib/app-runtime.js';
-import { resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName } from '../lib/cli-config.js';
-import { DEFAULT_DOCKER_VERSION, resolveDockerImageRef } from "../lib/docker-image.js";
+import { getCliConfigValue, resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName, } from '../lib/cli-config.js';
+import { DEFAULT_DOCKER_VERSION, DEFAULT_NB_IMAGE_VARIANT, inferNbImageRegistryFromRepository, normalizeNbImageVariant, resolveBuiltinDbImage, resolveDockerImageContainerPort, resolveDockerImageRef, resolveOfficialDockerRegistry, } from "../lib/docker-image.js";
 import { findAvailableTcpPort, validateAppPublicPath, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.js";
 import { validateExternalDbConfig, validateMysqlLowerCaseTableNamesCompatibility } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
@@ -31,7 +31,7 @@ import { startDockerLogFollower } from '../lib/docker-log-stream.js';
 import { buildInitAppEnvVarsFromConfig } from '../lib/managed-init-env.js';
 import { buildHookContext, persistHookScript, resolveHookScriptPath, runHookScriptHook, } from '../lib/hook-script.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
-import Download, { defaultDockerRegistryForLang } from './download.js';
+import Download from './download.js';
 import EnvAdd from "./env/add.js";
 import { resolveAppUrlFromApiBaseUrl } from "./env/shared.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -45,18 +45,6 @@ const DEFAULT_INSTALL_DB_PORTS = {
     mariadb: '3306',
     kingbase: '54321',
 };
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES = {
-    postgres: 'postgres:16',
-    mysql: 'mysql:8',
-    mariadb: 'mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN = {
-    postgres: 'registry.cn-shanghai.aliyuncs.com/nocobase/postgres:16',
-    mysql: 'registry.cn-shanghai.aliyuncs.com/nocobase/mysql:8',
-    mariadb: 'registry.cn-shanghai.aliyuncs.com/nocobase/mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
 const DEFAULT_INSTALL_DB_DATABASE = 'nocobase';
 const DEFAULT_INSTALL_DB_USER = 'nocobase';
 const DEFAULT_INSTALL_DB_PASSWORD = 'nocobase';
@@ -179,18 +167,15 @@ function downloadVersionPromptValue(version) {
 }
 function supportsBuiltinDbDialect(value) {
     const dialect = String(value ?? '').trim();
-    return Object.prototype.hasOwnProperty.call(DEFAULT_INSTALL_BUILTIN_DB_IMAGES, dialect);
+    return INSTALL_DB_DIALECTS.includes(dialect);
 }
 export function defaultDbPortForDialect(value) {
     const dialect = String(value ?? 'postgres').trim();
     return DEFAULT_INSTALL_DB_PORTS[isInstallDbDialect(dialect) ? dialect : 'postgres'];
 }
-function defaultBuiltinDbImageForDialect(value) {
+function defaultBuiltinDbImageForDialect(value, options) {
     const dialect = String(value ?? 'postgres').trim();
-    const defaults = resolveCliLocale(process.env.NB_LOCALE) === 'zh-CN'
-        ? DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN
-        : DEFAULT_INSTALL_BUILTIN_DB_IMAGES;
-    return supportsBuiltinDbDialect(dialect) ? defaults[dialect] : defaults.postgres;
+    return resolveBuiltinDbImage(dialect, { registry: options?.registry });
 }
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
@@ -1279,19 +1264,25 @@ export default class Install extends Command {
         return builtinDb && Install.shouldPublishBuiltinDbPort(values.source);
     }
     static async buildDbPromptInitialValues(params) {
-        if (params.flags['db-port'] !== undefined) {
-            return {};
-        }
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
         const values = {
             ...params.downloadResults,
             ...params.dbPreset,
         };
+        const dockerRegistry = String(values.dockerRegistry ?? '').trim() || resolveOfficialDockerRegistry(configuredRegistry);
+        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
+        const initialValues = values.builtinDb !== false && params.dbPreset.builtinDbImage === undefined
+            ? { builtinDbImage: defaultBuiltinDbImageForDialect(dialect, { registry: dockerRegistry }) }
+            : {};
+        if (params.flags['db-port'] !== undefined) {
+            return initialValues;
+        }
         if (!Install.shouldPublishBuiltinDbPortForValues(values)) {
-            return {};
+            return initialValues;
         }
-        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
         const defaultPort = defaultDbPortForDialect(dialect);
         return {
+            ...initialValues,
             dbPort: await Install.resolveAvailableDefaultPort(defaultPort, {
                 label: `Default ${dialect} port`,
                 warn: params.warnOnPortFallback ?? true,
@@ -1302,12 +1293,13 @@ export default class Install extends Command {
      * When install runs {@link Download.prompts} after app prompts, align the download
      * output directory with app settings, while Docker registry defaults follow the CLI locale.
      */
-    static buildDownloadPromptOptionsForInstall(appResults, envName) {
+    static async buildDownloadPromptOptionsForInstall(appResults, envName) {
         const appRoot = resolveConfiguredSourcePathValue(appResults, envName);
         const lang = String(appResults.lang ?? DEFAULT_INSTALL_LANG).trim() || DEFAULT_INSTALL_LANG;
+        const dockerRegistry = resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
         const initialValues = {
             lang,
-            dockerRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            dockerRegistry,
             outputDir: appRoot,
         };
         const values = {
@@ -1760,12 +1752,15 @@ export default class Install extends Command {
         return plan;
     }
     static async buildDockerAppPlan(params) {
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
+        const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
         const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-            defaultDockerRegistryForLang(process.env.NB_LOCALE);
+            resolveOfficialDockerRegistry(configuredRegistry);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
         const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
             defaultVersion: DEFAULT_DOCKER_VERSION,
+            variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
         });
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
         const configuredStoragePath = resolveConfiguredStoragePathValue(params.appResults, params.envName);
@@ -1792,6 +1787,7 @@ export default class Install extends Command {
             appResults: params.appResults,
             rootResults: params.rootResults,
         });
+        const containerPort = resolveDockerImageContainerPort(imageRef);
         const args = [
             'run',
             '-d',
@@ -1800,7 +1796,7 @@ export default class Install extends Command {
             '--network',
             params.networkName,
             '-p',
-            `${appPort}:80`,
+            `${appPort}:${containerPort}`,
         ];
         if (envFile) {
             args.push('--env-file', envFile);
@@ -1990,12 +1986,15 @@ export default class Install extends Command {
     }
     async ensureSkippedDownloadInputsReady(params) {
         if (params.source === 'docker') {
+            const configuredRegistry = await getCliConfigValue('nb-image-registry');
+            const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
             const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-                defaultDockerRegistryForLang(process.env.NB_LOCALE);
+                resolveOfficialDockerRegistry(configuredRegistry);
             const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
             const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-                defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+                defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
                 defaultVersion: DEFAULT_DOCKER_VERSION,
+                variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
             });
             const imageExists = await commandSucceeds('docker', ['image', 'inspect', imageRef]);
             if (!imageExists) {
@@ -2391,7 +2390,7 @@ export default class Install extends Command {
         if (resumePreset?.appPreset?.hookScript !== undefined && appResults.hookScript === undefined) {
             appResults.hookScript = resumePreset.appPreset.hookScript;
         }
-        const downloadOpts = Install.buildDownloadPromptOptionsForInstall(appResults, envName);
+        const downloadOpts = await Install.buildDownloadPromptOptionsForInstall(appResults, envName);
         downloadOpts.values = {
             ...(resumePreset?.downloadPreset ?? {}),
             ...downloadOpts.values,

package/dist/commands/proxy/caddy/generate.js

@@ -17,7 +17,7 @@ export default class ProxyCaddyGenerate extends Command {
         '<%= config.bin %> proxy caddy generate --host app1.example.com',
         '<%= config.bin %> proxy caddy generate --env app1 --host app1.example.com',
         '<%= config.bin %> proxy caddy generate --env app1 --host app1.example.com --port 8080',
-        '<%= config.bin %> proxy caddy generate --manual --name default --app-port 13000 --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0',
+        '<%= config.bin %> proxy caddy generate --manual --name default --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0 --upstream-port 13000',
     ];
     static flags = {
         env: Flags.string({
@@ -31,9 +31,6 @@ export default class ProxyCaddyGenerate extends Command {
         name: Flags.string({
             description: 'Output bundle name used under .nocobase/proxy/caddy in manual mode',
         }),
-        'app-port': Flags.string({
-            description: 'Upstream NocoBase app port in manual mode',
-        }),
         'storage-path': Flags.string({
             description: 'Path to the NocoBase storage directory in manual mode',
         }),
@@ -49,6 +46,9 @@ export default class ProxyCaddyGenerate extends Command {
         'upstream-host': Flags.string({
             description: 'Upstream host used by caddy reverse_proxy in manual mode',
         }),
+        'upstream-port': Flags.string({
+            description: 'Upstream port used by caddy reverse_proxy in manual mode',
+        }),
         'cdn-base-url': Flags.string({
             description: 'Client asset CDN base URL used when generating runtime HTML',
         }),
@@ -73,16 +73,16 @@ export default class ProxyCaddyGenerate extends Command {
         }
         if (manual) {
             const name = flags.name?.trim() || undefined;
-            const requestedAppPort = flags['app-port']?.trim() || undefined;
-            const appPort = normalizeProxyListenPort(requestedAppPort);
+            const requestedUpstreamPort = flags['upstream-port']?.trim() || undefined;
+            const upstreamPort = normalizeProxyListenPort(requestedUpstreamPort);
             const storagePath = flags['storage-path']?.trim() || undefined;
             const distRootPath = flags['dist-root-path']?.trim() || undefined;
             const runtimeVersion = flags['runtime-version']?.trim() || undefined;
-            if (requestedAppPort && !appPort) {
-                this.error(`Invalid manual app port "${requestedAppPort}". Use an integer between 1 and 65535.`);
+            if (requestedUpstreamPort && !upstreamPort) {
+                this.error(`Invalid manual upstream port "${requestedUpstreamPort}". Use an integer between 1 and 65535.`);
             }
-            if (!name || !appPort || !storagePath || !distRootPath || !runtimeVersion) {
-                this.error('Manual mode requires `--name`, `--app-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
+            if (!name || !upstreamPort || !storagePath || !distRootPath || !runtimeVersion) {
+                this.error('Manual mode requires `--name`, `--upstream-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
             }
             const driver = await getCaddyProxyDriver();
             const runtimeContext = await resolveCaddyProxyRuntimeContext();
@@ -91,12 +91,12 @@ export default class ProxyCaddyGenerate extends Command {
             try {
                 const { bundle, status } = await writeManualCaddyProxyBundle({
                     name,
-                    appPort,
                     storagePath,
                     distRootPath,
                     runtimeVersion,
                     appPublicPath: flags['app-public-path']?.trim() || undefined,
                     upstreamHost: flags['upstream-host']?.trim() || undefined,
+                    upstreamPort,
                     cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 }, {
                     host: flags.host?.trim() || undefined,

package/dist/commands/proxy/nginx/generate.js

@@ -16,7 +16,7 @@ export default class ProxyNginxGenerate extends Command {
         '<%= config.bin %> proxy nginx generate --host app1.example.com',
         '<%= config.bin %> proxy nginx generate --env app1 --host app1.example.com',
         '<%= config.bin %> proxy nginx generate --env app1 --host app1.example.com --port 8080',
-        '<%= config.bin %> proxy nginx generate --manual --name default --app-port 13000 --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0',
+        '<%= config.bin %> proxy nginx generate --manual --name default --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0 --upstream-port 13000',
     ];
     static flags = {
         env: Flags.string({
@@ -30,9 +30,6 @@ export default class ProxyNginxGenerate extends Command {
         name: Flags.string({
             description: 'Output bundle name used under .nocobase/proxy/nginx in manual mode',
         }),
-        'app-port': Flags.string({
-            description: 'Upstream NocoBase app port in manual mode',
-        }),
         'storage-path': Flags.string({
             description: 'Path to the NocoBase storage directory in manual mode',
         }),
@@ -48,6 +45,9 @@ export default class ProxyNginxGenerate extends Command {
         'upstream-host': Flags.string({
             description: 'Upstream host used by nginx proxy_pass in manual mode',
         }),
+        'upstream-port': Flags.string({
+            description: 'Upstream port used by nginx proxy_pass in manual mode',
+        }),
         'cdn-base-url': Flags.string({
             description: 'Client asset CDN base URL used when generating runtime HTML',
         }),
@@ -76,16 +76,16 @@ export default class ProxyNginxGenerate extends Command {
         }
         if (manual) {
             const name = flags.name?.trim() || undefined;
-            const requestedAppPort = flags['app-port']?.trim() || undefined;
-            const appPort = normalizeProxyListenPort(requestedAppPort);
+            const requestedUpstreamPort = flags['upstream-port']?.trim() || undefined;
+            const upstreamPort = normalizeProxyListenPort(requestedUpstreamPort);
             const storagePath = flags['storage-path']?.trim() || undefined;
             const distRootPath = flags['dist-root-path']?.trim() || undefined;
             const runtimeVersion = flags['runtime-version']?.trim() || undefined;
-            if (requestedAppPort && !appPort) {
-                this.error(`Invalid manual app port "${requestedAppPort}". Use an integer between 1 and 65535.`);
+            if (requestedUpstreamPort && !upstreamPort) {
+                this.error(`Invalid manual upstream port "${requestedUpstreamPort}". Use an integer between 1 and 65535.`);
             }
-            if (!name || !appPort || !storagePath || !distRootPath || !runtimeVersion) {
-                this.error('Manual mode requires `--name`, `--app-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
+            if (!name || !upstreamPort || !storagePath || !distRootPath || !runtimeVersion) {
+                this.error('Manual mode requires `--name`, `--upstream-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
             }
             const driver = await getNginxProxyDriver();
             const runtimeContext = await resolveNginxProxyRuntimeContext();
@@ -94,12 +94,12 @@ export default class ProxyNginxGenerate extends Command {
             try {
                 const { bundle, status } = await writeManualNginxProxyBundle({
                     name,
-                    appPort,
                     storagePath,
                     distRootPath,
                     runtimeVersion,
                     appPublicPath: flags['app-public-path']?.trim() || undefined,
                     upstreamHost: flags['upstream-host']?.trim() || undefined,
+                    upstreamPort,
                     cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 }, {
                     host: flags.host?.trim() || undefined,

package/dist/commands/revision/create.js

@@ -100,7 +100,7 @@ export default class RevisionCreate extends Command {
             path: '/app:publishEvent',
             body: {
                 plugin: 'plugin-version-control',
-                command: 'revision:create',
+                command: 'revision.create',
                 payload: {
                     description,
                 },

package/dist/commands/source/download.js

@@ -12,9 +12,10 @@ import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
 import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, resolveCliLocale, translateCli, } from "../../lib/cli-locale.js";
-import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_REGISTRY_ZH_CN, resolveDockerImageRef, } from "../../lib/docker-image.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_REGISTRY_ZH_CN, resolveOfficialDockerRegistry, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { getEnv } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { getCliConfigValue } from '../../lib/cli-config.js';
 import { buildBeforeDependencyInstallHookContext, runBeforeDependencyInstallHook, } from '../../lib/hook-script.js';
 import { run } from "../../lib/run-npm.js";
 import { printVerbose, setVerboseMode, startTask, stopTask, updateTask } from '../../lib/ui.js';
@@ -450,9 +451,9 @@ export default class SourceDownload extends Command {
         }
         return outputAbs;
     }
-    dockerTarPath(flags, outputAbs) {
+    async dockerTarPath(flags, outputAbs) {
         const imageRef = resolveDockerImageRef(flags['docker-registry'], flags.version, {
-            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultRegistry: await this.resolveConfiguredDockerRegistryDefault(),
             defaultVersion: 'latest',
         });
         const safeBase = imageRef.replace(/[\\/:]/g, '-');
@@ -462,9 +463,11 @@ export default class SourceDownload extends Command {
      * Defaults for prompts only. Keys present in **`preset`** are omitted so `runPromptCatalog` uses
      * **`values`** (preset) alone for those steps — no duplicate prefill for skipped prompts.
      */
-    buildInitialValuesFromParsed(flags, preset) {
+    async resolveConfiguredDockerRegistryDefault() {
+        return resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
+    }
+    buildInitialValuesFromParsed(flags, preset, defaultDockerRegistry) {
         const initialValues = {};
-        const localeDefaultDockerRegistry = defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE);
         const source = flags.source?.trim();
         if (source) {
             initialValues.source = source;
@@ -488,7 +491,7 @@ export default class SourceDownload extends Command {
             initialValues.dockerRegistry = String(flags['docker-registry'] ?? '').trim();
         }
         else {
-            initialValues.dockerRegistry = localeDefaultDockerRegistry;
+            initialValues.dockerRegistry = defaultDockerRegistry;
         }
         initialValues.dockerPlatform = normalizeDockerPlatform(flags['docker-platform']);
         initialValues.dockerSave = flags['docker-save'];
@@ -569,7 +572,7 @@ export default class SourceDownload extends Command {
         }
         return flags.build;
     }
-    mapCatalogResultsToResolved(results, flags) {
+    mapCatalogResultsToResolved(results, flags, defaultDockerRegistry) {
         const source = String(results.source);
         const version = resolveVersionFromResults(results, flags.version) || 'latest';
         const devDependencies = source === 'npm' ? Boolean(results.devDependencies) : undefined;
@@ -583,7 +586,7 @@ export default class SourceDownload extends Command {
         const dockerRegistry = source === 'docker'
             ? results.dockerRegistry !== undefined
                 ? String(results.dockerRegistry).trim() || undefined
-                : flags['docker-registry']?.trim() || defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE)
+                : flags['docker-registry']?.trim() || defaultDockerRegistry
             : undefined;
         const dockerPlatform = source === 'docker'
             ? normalizeDockerPlatform(results.dockerPlatform !== undefined ? results.dockerPlatform : flags['docker-platform'])
@@ -628,7 +631,8 @@ export default class SourceDownload extends Command {
             this.error('Download source is required in non-interactive mode. Use --source npm, --source git, or --source docker.');
         }
         const presetValues = this.buildPresetValuesFromFlags(flags);
-        const initialValues = this.buildInitialValuesFromParsed(flags, presetValues);
+        const defaultDockerRegistry = await this.resolveConfiguredDockerRegistryDefault();
+        const initialValues = this.buildInitialValuesFromParsed(flags, presetValues, defaultDockerRegistry);
         const results = await runPromptCatalog(SourceDownload.prompts, {
             initialValues,
             values: presetValues,
@@ -654,7 +658,7 @@ export default class SourceDownload extends Command {
         if (flags['docker-save'] && source !== 'docker') {
             this.error('--docker-save is only available when --source docker is selected.');
         }
-        return this.mapCatalogResultsToResolved(results, flags);
+        return this.mapCatalogResultsToResolved(results, flags, defaultDockerRegistry);
     }
     npmRegistryUrl(flags) {
         const url = flags['npm-registry']?.trim();
@@ -784,7 +788,7 @@ export default class SourceDownload extends Command {
     }
     async downloadFromDocker(flags) {
         const imageRef = resolveDockerImageRef(flags['docker-registry'], flags.version, {
-            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultRegistry: await this.resolveConfiguredDockerRegistryDefault(),
             defaultVersion: 'latest',
         });
         const platform = dockerPlatformArg(flags['docker-platform']);
@@ -811,7 +815,7 @@ export default class SourceDownload extends Command {
             await fsp.rm(outAbs, { recursive: true, force: true });
         }
         await fsp.mkdir(outAbs, { recursive: true });
-        const tarPath = this.dockerTarPath(flags, outAbs);
+        const tarPath = await this.dockerTarPath(flags, outAbs);
         this.log(`Saving Docker image tarball to ${tarPath}`);
         await this.runExternalCommand('docker', ['save', '-o', tarPath, imageRef], {
             errorName: 'docker save',

package/dist/lib/app-managed-resources.js

@@ -14,7 +14,7 @@ import { dockerContainerExists, managedAppLifecycleEnvVars, runLocalNocoBaseComm
 import { deriveBuiltinDbConnection, resolveBuiltinDbConnection } from './builtin-db.js';
 import { resolveConfiguredStoragePath } from './env-paths.js';
 import { resolveDockerEnvFileArg } from "./docker-env-file.js";
-import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "./docker-image.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageContainerPort, resolveDockerImageRef, } from "./docker-image.js";
 import { resolveHookScriptPath } from './hook-script.js';
 import { commandSucceeds, ensureDockerDaemonRunning, run } from './run-npm.js';
 import Install from '../commands/install.js';
@@ -192,6 +192,7 @@ export async function buildSavedDockerRunArgs(runtime, options) {
         defaultRegistry: DEFAULT_DOCKER_REGISTRY,
         defaultVersion: DEFAULT_DOCKER_VERSION,
     });
+    const containerPort = resolveDockerImageContainerPort(imageRef);
     const missing = [];
     if (!storagePath) {
         missing.push('storagePath');
@@ -233,7 +234,7 @@ export async function buildSavedDockerRunArgs(runtime, options) {
         args.push('--platform', dockerPlatform);
     }
     if (appPort) {
-        args.push('-p', `${appPort}:80`);
+        args.push('-p', `${appPort}:${containerPort}`);
     }
     if (envFile) {
         args.push('--env-file', envFile);

package/dist/lib/auth-store.js

@@ -125,12 +125,19 @@ function normalizeAuthConfig(config) {
             ...(updatePolicy ? { update: { policy: updatePolicy } } : {}),
             ...(settings.license?.pkgUrl ? { license: { pkgUrl: normalizeOptionalString(settings.license.pkgUrl) } } : {}),
             ...(settings.docker?.network || settings.docker?.containerPrefix
+                || settings.docker?.nbImageRegistry || settings.docker?.nbImageVariant
                 ? {
                     docker: {
                         ...(settings.docker?.network ? { network: normalizeOptionalString(settings.docker.network) } : {}),
                         ...(settings.docker?.containerPrefix
                             ? { containerPrefix: normalizeOptionalString(settings.docker.containerPrefix) }
                             : {}),
+                        ...(settings.docker?.nbImageRegistry
+                            ? { nbImageRegistry: normalizeOptionalString(settings.docker.nbImageRegistry) }
+                            : {}),
+                        ...(settings.docker?.nbImageVariant
+                            ? { nbImageVariant: normalizeOptionalString(settings.docker.nbImageVariant) }
+                            : {}),
                     },
                 }
                 : {}),

package/dist/lib/cli-config.js

@@ -9,6 +9,7 @@
 import { loadExactAuthConfig, saveAuthConfig } from './auth-store.js';
 import { resolveCliHomeRoot, resolveDefaultConfigScope } from './cli-home.js';
 import { CLI_LOCALE_FLAG_OPTIONS, normalizeCliLocale, resolveCliLocale } from './cli-locale.js';
+import { DEFAULT_NB_IMAGE_REGISTRY, DEFAULT_NB_IMAGE_VARIANT, NB_IMAGE_REGISTRY_OPTIONS, NB_IMAGE_VARIANT_OPTIONS, normalizeNbImageRegistry, normalizeNbImageVariant, } from './docker-image.js';
 export const DEFAULT_LICENSE_PKG_URL = 'https://pkg.nocobase.com/';
 export const DEFAULT_DOCKER_NETWORK = 'nocobase';
 export const DEFAULT_DOCKER_CONTAINER_PREFIX = 'nb';
@@ -37,6 +38,8 @@ export const SUPPORTED_CLI_CONFIG_KEYS = [
     'license.pkg-url',
     'docker.network',
     'docker.container-prefix',
+    'nb-image-registry',
+    'nb-image-variant',
     'bin.docker',
     'bin.caddy',
     'bin.git',
@@ -129,7 +132,11 @@ function pruneSettings(config) {
         delete config.settings?.license;
     }
     const docker = config.settings?.docker;
-    if (docker && !trimValue(docker.network) && !trimValue(docker.containerPrefix)) {
+    if (docker &&
+        !trimValue(docker.network) &&
+        !trimValue(docker.containerPrefix) &&
+        !trimValue(docker.nbImageRegistry) &&
+        !trimValue(docker.nbImageVariant)) {
         delete config.settings?.docker;
     }
     const bin = config.settings?.bin;
@@ -182,6 +189,10 @@ export function getExplicitCliConfigValue(config, key) {
             return trimValue(config.settings?.docker?.network);
         case 'docker.container-prefix':
             return trimValue(config.settings?.docker?.containerPrefix);
+        case 'nb-image-registry':
+            return normalizeNbImageRegistry(config.settings?.docker?.nbImageRegistry);
+        case 'nb-image-variant':
+            return normalizeNbImageVariant(config.settings?.docker?.nbImageVariant);
         case 'bin.docker':
             return trimValue(config.settings?.bin?.docker);
         case 'bin.caddy':
@@ -230,6 +241,10 @@ export function getEffectiveCliConfigValue(config, key) {
             return trimValue(config.name) || DEFAULT_DOCKER_NETWORK;
         case 'docker.container-prefix':
             return trimValue(config.name) || DEFAULT_DOCKER_CONTAINER_PREFIX;
+        case 'nb-image-registry':
+            return explicit ?? DEFAULT_NB_IMAGE_REGISTRY;
+        case 'nb-image-variant':
+            return explicit ?? DEFAULT_NB_IMAGE_VARIANT;
         case 'bin.docker':
             return DEFAULT_DOCKER_BIN;
         case 'bin.caddy':
@@ -305,6 +320,20 @@ export function normalizeCliConfigValue(key, value) {
         }
         return driver;
     }
+    if (key === 'nb-image-registry') {
+        const registry = normalizeNbImageRegistry(normalized);
+        if (!registry) {
+            throw new Error(`Config key "${key}" must be one of: ${NB_IMAGE_REGISTRY_OPTIONS.join(', ')}`);
+        }
+        return registry;
+    }
+    if (key === 'nb-image-variant') {
+        const variant = normalizeNbImageVariant(normalized);
+        if (!variant) {
+            throw new Error(`Config key "${key}" must be one of: ${NB_IMAGE_VARIANT_OPTIONS.join(', ')}`);
+        }
+        return variant;
+    }
     return normalized;
 }
 export async function loadCliConfig(options = {}) {
@@ -370,6 +399,18 @@ export async function setCliConfigValue(key, value, options = {}) {
                 containerPrefix: normalized,
             };
             break;
+        case 'nb-image-registry':
+            config.settings.docker = {
+                ...(config.settings.docker ?? {}),
+                nbImageRegistry: normalized,
+            };
+            break;
+        case 'nb-image-variant':
+            config.settings.docker = {
+                ...(config.settings.docker ?? {}),
+                nbImageVariant: normalized,
+            };
+            break;
         case 'bin.docker':
             config.settings.bin = {
                 ...(config.settings.bin ?? {}),
@@ -489,6 +530,16 @@ export async function deleteCliConfigValue(key, options = {}) {
                 delete config.settings.docker.containerPrefix;
             }
             break;
+        case 'nb-image-registry':
+            if (config.settings.docker) {
+                delete config.settings.docker.nbImageRegistry;
+            }
+            break;
+        case 'nb-image-variant':
+            if (config.settings.docker) {
+                delete config.settings.docker.nbImageVariant;
+            }
+            break;
         case 'bin.docker':
             if (config.settings.bin) {
                 delete config.settings.bin.docker;

package/dist/lib/docker-image.js

@@ -9,7 +9,30 @@
 export const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
 export const DEFAULT_DOCKER_REGISTRY_ZH_CN = 'registry.cn-shanghai.aliyuncs.com/nocobase/nocobase';
 export const DEFAULT_DOCKER_VERSION = 'alpha';
+export const NB_IMAGE_REGISTRY_OPTIONS = ['dockerhub', 'aliyun'];
+export const DEFAULT_NB_IMAGE_REGISTRY = 'dockerhub';
+export const NB_IMAGE_VARIANT_OPTIONS = ['standard', 'no-nginx', 'full', 'full-no-nginx'];
+export const DEFAULT_NB_IMAGE_VARIANT = 'full';
 export const DOCKER_IMAGE_FULL_SUFFIX = '-full';
+export const DOCKER_IMAGE_NO_NGINX_SUFFIX = '-no-nginx';
+export const DOCKER_IMAGE_FULL_NO_NGINX_SUFFIX = '-full-no-nginx';
+export const DEFAULT_KINGBASE_IMAGE = 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86';
+const OFFICIAL_DOCKER_REGISTRY_REPOSITORIES = {
+    dockerhub: DEFAULT_DOCKER_REGISTRY,
+    aliyun: DEFAULT_DOCKER_REGISTRY_ZH_CN,
+};
+const DEFAULT_BUILTIN_DB_IMAGES = {
+    postgres: 'postgres:16',
+    mysql: 'mysql:8',
+    mariadb: 'mariadb:11',
+    kingbase: DEFAULT_KINGBASE_IMAGE,
+};
+const ALIYUN_BUILTIN_DB_IMAGES = {
+    postgres: 'registry.cn-shanghai.aliyuncs.com/nocobase/postgres:16',
+    mysql: 'registry.cn-shanghai.aliyuncs.com/nocobase/mysql:8',
+    mariadb: 'registry.cn-shanghai.aliyuncs.com/nocobase/mariadb:11',
+    kingbase: DEFAULT_KINGBASE_IMAGE,
+};
 const OFFICIAL_FULL_IMAGE_REGISTRIES = new Set([
     DEFAULT_DOCKER_REGISTRY,
     DEFAULT_DOCKER_REGISTRY_ZH_CN,
@@ -17,21 +40,86 @@ const OFFICIAL_FULL_IMAGE_REGISTRIES = new Set([
 function trimValue(value) {
     return String(value ?? '').trim();
 }
+export function normalizeNbImageRegistry(value) {
+    const normalized = trimValue(value);
+    if (!normalized) {
+        return undefined;
+    }
+    return NB_IMAGE_REGISTRY_OPTIONS.includes(normalized)
+        ? normalized
+        : undefined;
+}
+export function normalizeNbImageVariant(value) {
+    const normalized = trimValue(value);
+    if (!normalized) {
+        return undefined;
+    }
+    return NB_IMAGE_VARIANT_OPTIONS.includes(normalized)
+        ? normalized
+        : undefined;
+}
+export function resolveOfficialDockerRegistry(value) {
+    const registry = normalizeNbImageRegistry(value) ?? DEFAULT_NB_IMAGE_REGISTRY;
+    return OFFICIAL_DOCKER_REGISTRY_REPOSITORIES[registry];
+}
+export function inferNbImageRegistryFromRepository(value) {
+    const repository = trimValue(value);
+    return Object.entries(OFFICIAL_DOCKER_REGISTRY_REPOSITORIES).find(([, candidate]) => candidate === repository)?.[0];
+}
+function hasKnownVariantSuffix(tag) {
+    return (tag.endsWith(DOCKER_IMAGE_FULL_NO_NGINX_SUFFIX) ||
+        tag.endsWith(DOCKER_IMAGE_NO_NGINX_SUFFIX) ||
+        tag.endsWith(DOCKER_IMAGE_FULL_SUFFIX));
+}
 export function shouldUseFullDockerImageTag(registry) {
     return OFFICIAL_FULL_IMAGE_REGISTRIES.has(trimValue(registry));
 }
-export function normalizeDockerImageTag(registry, version) {
+export function normalizeDockerImageTag(registry, version, options) {
     const tag = trimValue(version) || DEFAULT_DOCKER_VERSION;
-    if (!shouldUseFullDockerImageTag(registry)) {
+    if (hasKnownVariantSuffix(tag)) {
         return tag;
     }
-    return tag.endsWith(DOCKER_IMAGE_FULL_SUFFIX)
-        ? tag
-        : `${tag}${DOCKER_IMAGE_FULL_SUFFIX}`;
+    const explicitVariant = normalizeNbImageVariant(options?.variant) ?? normalizeNbImageVariant(options?.defaultVariant);
+    const inferredVariant = shouldUseFullDockerImageTag(registry) ? DEFAULT_NB_IMAGE_VARIANT : 'standard';
+    const variant = explicitVariant ?? inferredVariant;
+    switch (variant) {
+        case 'standard':
+            return tag;
+        case 'no-nginx':
+            return `${tag}${DOCKER_IMAGE_NO_NGINX_SUFFIX}`;
+        case 'full':
+            return `${tag}${DOCKER_IMAGE_FULL_SUFFIX}`;
+        case 'full-no-nginx':
+            return `${tag}${DOCKER_IMAGE_FULL_NO_NGINX_SUFFIX}`;
+    }
 }
 export function resolveDockerImageRef(registry, version, options) {
     const resolvedRegistry = trimValue(registry) || options?.defaultRegistry || DEFAULT_DOCKER_REGISTRY;
     const rawVersion = trimValue(version) || options?.defaultVersion || DEFAULT_DOCKER_VERSION;
-    const normalizedTag = normalizeDockerImageTag(resolvedRegistry, rawVersion);
+    const normalizedTag = normalizeDockerImageTag(resolvedRegistry, rawVersion, {
+        variant: options?.variant,
+        defaultVariant: options?.defaultVariant,
+    });
     return `${resolvedRegistry}:${normalizedTag}`;
 }
+function extractDockerImageTag(imageRef) {
+    const ref = trimValue(imageRef);
+    const lastSlashIndex = ref.lastIndexOf('/');
+    const lastColonIndex = ref.lastIndexOf(':');
+    if (lastColonIndex <= lastSlashIndex) {
+        return undefined;
+    }
+    return ref.slice(lastColonIndex + 1) || undefined;
+}
+export function resolveDockerImageContainerPort(imageRef) {
+    const tag = extractDockerImageTag(imageRef);
+    return tag?.endsWith(DOCKER_IMAGE_NO_NGINX_SUFFIX) ? '13000' : '80';
+}
+export function resolveBuiltinDbImage(dbDialect, options) {
+    const dialect = trimValue(dbDialect) || 'postgres';
+    const configuredRegistry = normalizeNbImageRegistry(options?.registry) ??
+        inferNbImageRegistryFromRepository(options?.registry) ??
+        DEFAULT_NB_IMAGE_REGISTRY;
+    const defaults = configuredRegistry === 'aliyun' ? ALIYUN_BUILTIN_DB_IMAGES : DEFAULT_BUILTIN_DB_IMAGES;
+    return defaults[dialect] ?? defaults.postgres;
+}

package/dist/lib/env-proxy.js

@@ -309,17 +309,30 @@ function createManualProxyEnvSettings(input) {
     };
 }
 function normalizeManualNginxInput(input) {
+    const upstreamPort = trimValue(input.upstreamPort) ?? trimValue(input.appPort);
     return {
         name: String(input.name).trim(),
-        appPort: String(input.appPort).trim(),
         storagePath: String(input.storagePath).trim(),
         distRootPath: String(input.distRootPath).trim(),
         runtimeVersion: String(input.runtimeVersion).trim(),
         appPublicPath: trimValue(input.appPublicPath),
         upstreamHost: trimValue(input.upstreamHost),
+        upstreamPort,
+        appPort: trimValue(input.appPort),
         cdnBaseUrl: trimValue(input.cdnBaseUrl),
     };
 }
+function normalizeProxyPort(value) {
+    const normalized = trimValue(value);
+    if (!normalized || !/^\d+$/.test(normalized)) {
+        return undefined;
+    }
+    const port = Number(normalized);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        return undefined;
+    }
+    return normalized;
+}
 async function parseVersionFromPackageJson(content, sourceLabel) {
     let parsed;
     try {
@@ -563,7 +576,8 @@ function buildCaddyRuntimeConfig(context, variant) {
 }
 async function buildEnvProxyNginxRenderContext(source, options) {
     const proxyHost = await resolveProxyUpstreamHost(options);
-    const backendUrl = `http://${proxyHost}:${source.apiPort}`;
+    const upstreamPort = normalizeProxyPort(options?.upstreamPort) ?? source.apiPort;
+    const backendUrl = `http://${proxyHost}:${upstreamPort}`;
     const cdnBaseUrl = source.settings.cdnBaseUrl ?? buildDefaultCdnBaseUrl(source.settings.appPublicPath, source.activeVersion);
     const entryDir = resolveEnvProxyEntryDir(source.envName, { scope: options?.scope });
     const publicDir = resolveEnvProxyNginxPublicOutputDir(source.envName, { scope: options?.scope });
@@ -637,7 +651,7 @@ async function resolveManualNginxBundleSource(input) {
         storagePath: normalized.storagePath,
         distRootPath: normalized.distRootPath,
         settings: createManualProxyEnvSettings(normalized),
-        apiPort: normalized.appPort,
+        apiPort: normalized.upstreamPort,
         activeVersion: normalized.runtimeVersion,
     };
 }
@@ -704,6 +718,7 @@ export async function buildManualEnvProxyNginxBundle(input, options) {
     return await buildNginxBundleFromSource(await resolveManualNginxBundleSource(input), {
         ...options,
         upstreamHost: trimValue(input.upstreamHost) ?? options?.upstreamHost,
+        upstreamPort: normalizeProxyPort(input.upstreamPort) ?? options?.upstreamPort,
     });
 }
 async function buildNginxBundleFromSource(source, options) {
@@ -771,6 +786,7 @@ export async function buildManualEnvProxyCaddyBundle(input, options) {
     return await buildCaddyBundleFromSource(await resolveManualNginxBundleSource(input), {
         ...options,
         upstreamHost: trimValue(input.upstreamHost) ?? options?.upstreamHost,
+        upstreamPort: normalizeProxyPort(input.upstreamPort) ?? options?.upstreamPort,
     });
 }
 async function buildCaddyBundleFromSource(source, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-alpha.4",
+  "version": "2.2.0-alpha.5",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -144,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "81bf8733db4bccf08a6bc5e6d97f274bce349161"
+  "gitHead": "814ff497dd1233ca7218c9f7f2a016c2ead6516d"
 }