@xcanwin/manyoyo 4.2.4 → 4.2.6

package/lib/image-build.js

@@ -152,21 +152,32 @@ function cleanupGoTmpPath(ctx, tmpGoPath, warnOnError) {
     const { YELLOW, NC } = ctx.colors;
     if (!fs.existsSync(tmpGoPath)) return;
 
+    let cleanupFailed = false;
     try {
         ctx.runCmd('go', ['clean', '-modcache'], {
             stdio: 'inherit',
             ignoreError: true,
             env: { ...process.env, GOPATH: tmpGoPath }
         });
-        ctx.runCmd('chmod', ['-R', 'u+w', tmpGoPath], { stdio: 'inherit', ignoreError: true });
-        ctx.runCmd('rm', ['-rf', tmpGoPath], { stdio: 'inherit', ignoreError: true });
-    } catch (e) {
-        if (warnOnError) {
-            ctx.log(`${YELLOW}提示: 临时目录清理失败，可手动删除 ${tmpGoPath}${NC}`);
-        }
+    } catch (e) { cleanupFailed = true; }
+    try { ctx.runCmd('chmod', ['-R', 'u+w', tmpGoPath], { stdio: 'inherit', ignoreError: true }); } catch (e) { cleanupFailed = true; }
+    try { ctx.runCmd('rm', ['-rf', tmpGoPath], { stdio: 'inherit', ignoreError: true }); } catch (e) { cleanupFailed = true; }
+    if (cleanupFailed && warnOnError) {
+        ctx.log(`${YELLOW}提示: 临时目录清理失败，可手动删除 ${tmpGoPath}${NC}`);
     }
 }
 
+function isGoCommandMissing(error) {
+    const message = error && error.message ? String(error.message) : '';
+    const stderr = error && error.stderr ? String(error.stderr) : '';
+    const stdout = error && error.stdout ? String(error.stdout) : '';
+    const combined = `${message}\n${stderr}\n${stdout}`.toLowerCase();
+    if (error && String(error.code || '').toUpperCase() === 'ENOENT') {
+        return /\bgo\b/.test(message.toLowerCase()) || /spawnsync go enoent|spawn go enoent/.test(combined);
+    }
+    return /spawnsync go enoent|spawn go enoent|go: not found|go: command not found|command not found: go/.test(combined);
+}
+
 function resolveGoplsSource(tmpGoPath, arch) {
     const primary = path.join(tmpGoPath, 'bin', `linux_${arch}`, 'gopls');
     if (fs.existsSync(primary)) return primary;
@@ -209,6 +220,11 @@ function prepareGoplsBuildCache(ctx, cache, imageTool, arch) {
         ctx.log(`${GREEN}✓ gopls 下载完成${NC}`);
         cleanupGoTmpPath(ctx, tmpGoPath, true);
     } catch (e) {
+        if (isGoCommandMissing(e)) {
+            ctx.log(`${YELLOW}提示: 未检测到本机 go，跳过 gopls 本地缓存预下载，将在镜像构建阶段安装${NC}`);
+            cleanupGoTmpPath(ctx, tmpGoPath, false);
+            return;
+        }
         ctx.error(`${RED}错误: gopls 下载失败${NC}`);
         throw e;
     }
@@ -285,6 +301,10 @@ function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
     const args = [
         'run', '--rm', '--privileged',
         '--network', `host`,
+        '-e', `HTTP_PROXY=$HTTP_PROXY`,
+        '-e', `HTTPS_PROXY=$HTTPS_PROXY`,
+        '-e', `ALL_PROXY=$ALL_PROXY`,
+        '-e', `NO_PROXY=$NO_PROXY`,
         '--volume', `${ctx.rootDir}:/workspace`,
         '--entrypoint', 'buildctl-daemonless.sh',
         'docker.io/moby/buildkit:latest',
@@ -293,6 +313,7 @@ function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
         '--local', 'context=/workspace',
         '--local', 'dockerfile=/workspace',
         '--opt', `filename=${dockerfileRelativePath}`,
+        '--opt', 'network=host',
         '--opt', `build-arg:HTTP_PROXY=$HTTP_PROXY`,
         '--opt', `build-arg:HTTPS_PROXY=$HTTPS_PROXY`,
         '--opt', `build-arg:ALL_PROXY=$ALL_PROXY`,

package/package.json

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