@lazycatcloud/lzc-cli 1.3.17 → 2.0.0-pre.1

package/lib/docker/index.js

@@ -2,8 +2,9 @@ import path from 'node:path';
 import logger from 'loglevel';
 import { DebugBridge } from '../debug_bridge.js';
 import shellApi from '../shellapi.js';
-import { isFileExist, isUserApp, loadFromYaml } from '../utils.js';
+import { isFileExist, loadFromYaml } from '../utils.js';
 import { t } from '../i18n/index.js';
+import { resolveBuildRemoteFromFile } from '../build_remote.js';
 
 function dockerMiddleware(argv, yargs) {
 	if (argv.$0 == 'lzc-docker' || argv.$0 == 'lzc-docker-compose') {
@@ -53,8 +54,11 @@ export function singleLzcDockerCommand(commandName = 'docker') {
 		builder: builder,
 		handler: async (args) => {
 			logger.debug('args: ', args);
-			await shellApi.init();
-			const bridge = new DebugBridge();
+			const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+			if (!buildRemote) {
+				await shellApi.init();
+			}
+			const bridge = new DebugBridge(process.cwd(), buildRemote);
 			await bridge.init();
 			logger.debug('docker', args.dockerArgs);
 			await bridge.lzcDocker(args.dockerArgs);
@@ -69,7 +73,10 @@ export function singleLzcDockerComposeCommand(commandName = 'docker-compose') {
 		builder: builder,
 		handler: async (args) => {
 			logger.debug('args: ', args);
-			await shellApi.init();
+			const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+			if (!buildRemote) {
+				await shellApi.init();
+			}
 			let manifest = null;
 			try {
 				for (let name of ['lzc-manifest.yml', 'manifest.yml']) {
@@ -83,13 +90,20 @@ export function singleLzcDockerComposeCommand(commandName = 'docker-compose') {
 				logger.debug('load manifest: ', e);
 			}
 			const pkgId = manifest ? manifest['package'] : '';
-			const userApp = manifest ? isUserApp(manifest) : false;
 
-			const bridge = new DebugBridge();
+			const bridge = new DebugBridge(process.cwd(), buildRemote);
 			await bridge.init();
 			const options = args.dockerArgs;
-			if (pkgId != '' && !options.some((o) => o == '--project-directory')) {
-				options.unshift('--project-directory', `/lzcapp/run/lzc-docker/compose/${pkgId}${userApp ? '/' + shellapi.uid : ''}`);
+			if (
+				pkgId != '' &&
+				!options.some((o) => o == '--project-directory') &&
+				!options.some((o) => o == '-p') &&
+				!options.some((o) => o == '--project-name') &&
+				!options.some((o) => o == '-f') &&
+				!options.some((o) => o == '--file')
+			) {
+				const projectName = pkgId.replaceAll('.', '');
+				options.unshift('-p', projectName);
 			}
 			logger.debug('docker-compose', options.join(' '));
 			await bridge.lzcDockerCompose(options);
@@ -98,6 +112,12 @@ export function singleLzcDockerComposeCommand(commandName = 'docker-compose') {
 }
 
 export function lzcDockerCommand(program) {
-	program.command(singleLzcDockerCommand());
-	program.command(singleLzcDockerComposeCommand());
+	program.command({
+		...singleLzcDockerCommand(),
+		desc: false,
+	});
+	program.command({
+		...singleLzcDockerComposeCommand(),
+		desc: false,
+	});
 }