优化部署流程

scripts/prepare-deploy.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Build deployment images inside Docker; no host Rust or Haskell tools required."""
 import argparse
+import os
 from pathlib import Path
 import shutil
 import subprocess
@@ -10,12 +11,13 @@ parser = argparse.ArgumentParser(description=__doc__)
 parser.add_argument('--env-file', type=Path, help='Compose environment file (default: .env, or .env.example when absent)')
 parser.add_argument('--build-database', action='store_true', help='compatibility option; database is always built inside Docker')
 parser.add_argument('--sources-env-file', type=Path, help='optional second Compose env file overriding build download sources')
+parser.add_argument('--project-name', help='Compose project name')
 args = parser.parse_args()
 if shutil.which('docker') is None:
     parser.error('Docker with the Compose plugin is required; see docs/deployment.md.')
 for manifest in ['external/ChuSQL-RustDriver/Cargo.toml', 'external/ChuSQL/chusql-core/storage/Cargo.toml']:
     if not (root / manifest).is_file():
-        parser.error('Initialize external dependencies with python3 scripts/init-deps.py first.')
+        parser.error('Initialize external dependencies with python3 scripts/fetch-deps.py first.')
 envfile = args.env_file or (root / '.env' if (root / '.env').is_file() else root / '.env.example')
 if not envfile.is_file():
     parser.error(f'Environment file does not exist: {envfile}')
@@ -24,12 +26,18 @@ if args.sources_env_file:
     if not args.sources_env_file.is_file():
         parser.error(f'Source configuration does not exist: {args.sources_env_file}')
     command.extend(['--env-file', str(args.sources_env_file.resolve())])
+if args.project_name:
+    command.extend(['-p', args.project_name])
 command.extend([
     '-f', str(root / 'deploy/compose.yaml'),
     'build', 'init', 'api', 'ssh', 'db', 'db-init', 'web',
 ])
+# Build-only parsing needs values even before deploy.sh creates runtime credentials.
+build_env = os.environ.copy()
+for key in ['CHUSQL_ROOT_PASSWORD', 'CHUSQL_PASSWORD']:
+    build_env[key] = build_env.get(key) or 'unused-build-placeholder'
 try:
-    subprocess.run(command, cwd=root, check=True)
+    subprocess.run(command, cwd=root, check=True, env=build_env)
 except subprocess.CalledProcessError as error:
     raise SystemExit(error.returncode) from None
 print('Deployment images built inside Docker. No host binaries were created.')