@xcanwin/manyoyo 4.2.0 → 4.2.3

package/lib/image-build.js

@@ -253,19 +253,50 @@ function extractBuildArgValues(args) {
     return values;
 }
 
-function buildPodmanBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs) {
+function isBuildCapabilityError(error) {
+    const combined = [
+        error && error.message ? error.message : '',
+        error && error.stderr ? String(error.stderr) : '',
+        error && error.stdout ? String(error.stdout) : ''
+    ].join('\n').toLowerCase();
+
+    const patterns = [
+        /unknown flag/,
+        /unknown shorthand flag/,
+        /unknown option/,
+        /unrecognized option/,
+        /unknown instruction:\s*"?((case|if|then|fi|for|while|do|done|esac))"?/,
+        /buildx .* not available/,
+        /buildx .* not found/,
+        /buildx .* not enabled/,
+        /'buildx' is not a docker command/,
+        /the --load option requires buildx/,
+        /unsupported.*--load/,
+        /does not support.*--load/,
+        /driver .* not supported/,
+        /no such plugin.*buildx/
+    ];
+    return patterns.some(pattern => pattern.test(combined));
+}
+
+function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs) {
     const dockerfileRelativePath = path.relative(ctx.rootDir, dockerfilePath).split(path.sep).join('/');
     const buildArgs = extractBuildArgValues(imageBuildArgs);
     const args = [
         'run', '--rm', '--privileged',
+        '--network', `host`,
         '--volume', `${ctx.rootDir}:/workspace`,
         '--entrypoint', 'buildctl-daemonless.sh',
-        'moby/buildkit:latest',
+        'docker.io/moby/buildkit:latest',
         'build',
         '--frontend', 'dockerfile.v0',
         '--local', 'context=/workspace',
         '--local', 'dockerfile=/workspace',
-        '--opt', `filename=${dockerfileRelativePath}`
+        '--opt', `filename=${dockerfileRelativePath}`,
+        '--opt', `build-arg:HTTPS_PROXY=$HTTPS_PROXY`,
+        '--opt', `build-arg:HTTPS_PROXY=$HTTPS_PROXY`,
+        '--opt', `build-arg:ALL_PROXY=$ALL_PROXY`,
+        '--opt', `build-arg:NO_PROXY=$NO_PROXY`
     ];
 
     for (const value of buildArgs) {
@@ -397,48 +428,53 @@ async function buildImage(options = {}) {
         '--progress=plain',
         '--no-cache'
     ];
+    const buildkitRunArgs = buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs);
 
-    ctx.log(`${BLUE}准备执行命令:${NC}`);
-    const usePodmanBuildkit = ctx.dockerCmd === 'podman';
-    const buildkitRunArgs = usePodmanBuildkit
-        ? buildPodmanBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
-        : [];
-    if (usePodmanBuildkit) {
-        ctx.log(`${ctx.dockerCmd} ${buildkitRunArgs.map(quoteShellArg).join(' ')} | ${ctx.dockerCmd} load\n`);
-    } else {
-        ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
+    function logBuildSuccess() {
+        ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
+        ctx.log(`${BLUE}使用镜像:${NC}`);
+        ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
+        ctx.pruneDanglingImages();
     }
 
+    ctx.log(`${BLUE}准备执行命令:${NC}`);
+    ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
+
     if (!ctx.yesMode) {
         await ctx.askQuestion('❔ 是否继续构建? [ 直接回车=继续, ctrl+c=取消 ]: ');
         ctx.log('');
     }
 
-    if (usePodmanBuildkit) {
-        try {
-            await ctx.runCmdPipeline(ctx.dockerCmd, buildkitRunArgs, ctx.dockerCmd, ['load'], { stdio: 'inherit' });
-            ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
-            ctx.log(`${BLUE}使用镜像:${NC}`);
-            ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
-            ctx.pruneDanglingImages();
+    try {
+        ctx.runCmd(ctx.dockerCmd, buildArgs, { stdio: 'inherit' });
+        logBuildSuccess();
+        return;
+    } catch (e) {
+        const stderrText = e && e.stderr ? String(e.stderr).trim() : '';
+        const stdoutText = e && e.stdout ? String(e.stdout).trim() : '';
+        const hasDiagnostics = Boolean(stderrText || stdoutText);
+        const capabilityError = isBuildCapabilityError(e);
+
+        if (!capabilityError && hasDiagnostics) {
+            ctx.error(`${RED}错误: 镜像构建失败${NC}`);
+            ctx.exit(1);
             return;
-        } catch (e) {
-            ctx.log(`${YELLOW}⚠️  BuildKit 构建失败，回退到 podman build...${NC}`);
-            if (e && e.message) {
-                ctx.log(`${YELLOW}原因: ${e.message}${NC}`);
-            }
-            ctx.log('');
-            ctx.log(`${BLUE}回退命令:${NC}`);
-            ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
         }
+        if (!capabilityError && !hasDiagnostics) {
+            ctx.log(`${YELLOW}⚠️  未捕获到构建器错误详情，尝试回退到 BuildKit...${NC}`);
+        }
+        ctx.log(`${YELLOW}⚠️  直接 build 失败，回退到 BuildKit...${NC}`);
+        if (e && e.message) {
+            ctx.log(`${YELLOW}原因: ${e.message}${NC}`);
+        }
+        ctx.log('');
+        ctx.log(`${BLUE}回退命令:${NC}`);
+        ctx.log(`${ctx.dockerCmd} ${buildkitRunArgs.map(quoteShellArg).join(' ')} | ${ctx.dockerCmd} load\n`);
     }
 
     try {
-        ctx.runCmd(ctx.dockerCmd, buildArgs, { stdio: 'inherit' });
-        ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
-        ctx.log(`${BLUE}使用镜像:${NC}`);
-        ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
-        ctx.pruneDanglingImages();
+        await ctx.runCmdPipeline(ctx.dockerCmd, buildkitRunArgs, ctx.dockerCmd, ['load'], { stdio: 'inherit' });
+        logBuildSuccess();
     } catch (e) {
         ctx.error(`${RED}错误: 镜像构建失败${NC}`);
         ctx.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "4.2.0",
+    "version": "4.2.3",
     "imageVersion": "1.8.0-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [