@xcanwin/manyoyo 3.0.1 → 3.1.0

package/README.md

@@ -23,19 +23,7 @@
 
 # 使用方法
 
-## 1. 安装 podman
-
-- 安装 [podman](https://podman.io/docs/installation)
-
-## 2. 编译镜像
-
-```bash
-podman pull ubuntu:24.04
-iv=1.4.0-all && podman build -t localhost/xcanwin/manyoyo:$iv -f docker/manyoyo.Dockerfile . --build-arg EXT=all --no-cache
-podman image prune -f
-```
-
-## 3. 安装 manyoyo（选一种）
+## 1. 安装 manyoyo
 
 ### 全局安装（推荐）
 
@@ -49,6 +37,32 @@ npm install -g @xcanwin/manyoyo
 npm install -g .
 ```
 
+## 2. 安装 podman
+
+- 安装 [podman](https://podman.io/docs/installation)
+
+## 3. 编译镜像
+
+安装 manyoyo 后，可以使用内置命令构建镜像：
+
+```bash
+# 拉取基础镜像
+podman pull ubuntu:24.04
+
+# 使用 manyoyo 构建镜像（推荐）
+manyoyo --ib all                     # 构建 all 版本（包含所有工具）
+manyoyo --ib common                  # 构建 common 版本（基础版本）
+manyoyo --ib go,codex,java,gemini    # 构建 go 版本（包含 go,codex,java,gemini 工具）
+
+# 自定义镜像名称和版本
+manyoyo --ib all --in myimage --iv 2.0.0
+# 构建：myimage:2.0.0-all
+
+# 或手动构建（不推荐）
+iv=1.4.0 && podman build -t localhost/xcanwin/manyoyo:$iv-all -f docker/manyoyo.Dockerfile . --build-arg EXT=all --no-cache
+podman image prune -f
+```
+
 ## 4. 使用方法
 
 ### 基础命令
@@ -189,6 +203,7 @@ manyoyo -n socket-dev -m mdsock -x docker ps
 | `-x CMD` | `--sf`, `--shell-full` | 完整命令（替代 --sp, -s 和 --） |
 | `-y CLI` | `--yolo` | 无需确认运行 AI 智能体 |
 | `-m MODE` | `--cm`, `--cont-mode` | 设置容器模式（common, dind, mdsock） |
+| `--ib EXT` | `--image-build` | 构建镜像，EXT 为镜像变体（all, go, common） |
 | `--install NAME` | | 安装 manyoyo 命令 |
 | `-V` | `--version` | 显示版本 |
 | `-h` | `--help` | 显示帮助 |

package/bin/manyoyo.js

@@ -8,7 +8,7 @@ const { execSync, spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
-const { version: BIN_VERSION } = require('../package.json');
+const { version: BIN_VERSION, imageVersion: IMAGE_VERSION_BASE } = require('../package.json');
 
 // Helper function to format date like bash $(date +%m%d-%H%M)
 function formatDate() {
@@ -25,12 +25,14 @@ let CONTAINER_NAME = `myy-${formatDate()}`;
 let HOST_PATH = process.cwd();
 let CONTAINER_PATH = HOST_PATH;
 let IMAGE_NAME = "localhost/xcanwin/manyoyo";
-let IMAGE_VERSION = "1.4.0-all";
+let IMAGE_VERSION = `${IMAGE_VERSION_BASE}-all`;
 let EXEC_COMMAND = "";
 let EXEC_COMMAND_PREFIX = "";
 let EXEC_COMMAND_SUFFIX = "";
 let ENV_FILE = "";
 let SHOULD_REMOVE = false;
+let SHOULD_BUILD_IMAGE = false;
+let BUILD_IMAGE_EXT = "";
 let CONTAINER_ENVS = [];
 let CONTAINER_VOLUMES = [];
 let MANYOYO_NAME = "manyoyo";
@@ -83,12 +85,15 @@ function showHelp() {
     console.log("                                 例如 claude / c, gemini / gm, codex / cx, opencode / oc");
     console.log("  -m|--cm|--cont-mode STRING     设置容器嵌套容器模式");
     console.log("                                 例如 common, dind, mdsock");
+    console.log("  --ib|--image-build EXT         构建镜像，EXT 为镜像变体，逗号分割");
+    console.log("                                 例如 \"common\" (默认值), \"all\", \"go,codex,java,gemini\" ...");
     console.log("  --install NAME                 安装manyoyo命令");
     console.log("                                 例如 docker-cli-plugin");
     console.log("  -V|--version                   显示版本");
     console.log("  -h|--help                      显示帮助");
     console.log("");
     console.log(`${BLUE}Example:${NC}`);
+    console.log(`  ${MANYOYO_NAME} --ib all                            构建 all 版本镜像`);
     console.log(`  ${MANYOYO_NAME} -n test --ef ./xxx.env -y c         设置环境变量并运行无需确认的AGENT`);
     console.log(`  ${MANYOYO_NAME} -n test -- -c                       恢复之前会话`);
     console.log(`  ${MANYOYO_NAME} -x echo 123                         指定命令执行`);
@@ -295,6 +300,46 @@ function getContList() {
     }
 }
 
+async function buildImage(ext, imageName, imageVersion) {
+    // Use package.json imageVersion if not specified
+    const version = imageVersion || IMAGE_VERSION_BASE;
+    const fullImageTag = `${imageName}:${version}-${ext}`;
+
+    console.log(`${CYAN}🔨 正在构建镜像: ${YELLOW}${fullImageTag}${NC}`);
+    console.log(`${BLUE}构建参数: EXT=${ext}${NC}\n`);
+
+    // Find Dockerfile path
+    const dockerfilePath = path.join(__dirname, '../docker/manyoyo.Dockerfile');
+    if (!fs.existsSync(dockerfilePath)) {
+        console.error(`${RED}错误: 找不到 Dockerfile: ${dockerfilePath}${NC}`);
+        process.exit(1);
+    }
+
+    // Build command
+    const buildCmd = `${DOCKER_CMD} build -t "${fullImageTag}" -f "${dockerfilePath}" "${path.join(__dirname, '..')}" --build-arg EXT=${ext} --no-cache`;
+
+    console.log(`${BLUE}准备执行命令:${NC}`);
+    console.log(`${buildCmd}\n`);
+
+    const reply = await askQuestion(`❔ 是否继续构建? [ 直接回车=继续, ctrl+c=取消 ]: `);
+    console.log("");
+
+    try {
+        execSync(buildCmd, { stdio: 'inherit' });
+        console.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
+        console.log(`${BLUE}使用镜像:${NC}`);
+        console.log(`  manyoyo -n test --in ${imageName} --iv ${version}-${ext} -y c`);
+
+        // Prune dangling images
+        console.log(`\n${YELLOW}清理悬空镜像...${NC}`);
+        execSync(`${DOCKER_CMD} image prune -f`, { stdio: 'inherit' });
+        console.log(`${GREEN}✅ 清理完成${NC}`);
+    } catch (e) {
+        console.error(`${RED}错误: 镜像构建失败${NC}`);
+        process.exit(1);
+    }
+}
+
 // ==============================================================================
 // Main Function Helpers
 // ==============================================================================
@@ -439,6 +484,13 @@ function parseArguments(argv) {
                 i += 2;
                 break;
 
+            case '--ib':
+            case '--image-build':
+                SHOULD_BUILD_IMAGE = true;
+                BUILD_IMAGE_EXT = args[i + 1];
+                i += 2;
+                break;
+
             case '--install':
                 installManyoyo(args[i + 1]);
                 process.exit(0);
@@ -633,19 +685,25 @@ async function main() {
         // 2. Parse command-line arguments
         parseArguments(process.argv);
 
-        // 3. Handle remove container operation
+        // 3. Handle image build operation
+        if (SHOULD_BUILD_IMAGE) {
+            await buildImage(BUILD_IMAGE_EXT, IMAGE_NAME, IMAGE_VERSION.split('-')[0]);
+            process.exit(0);
+        }
+
+        // 4. Handle remove container operation
         handleRemoveContainer();
 
-        // 4. Validate host path safety
+        // 5. Validate host path safety
         validateHostPath();
 
-        // 5. Setup container (create or connect)
+        // 6. Setup container (create or connect)
         const defaultCommand = await setupContainer();
 
-        // 6. Execute command in container
+        // 7. Execute command in container
         executeInContainer(defaultCommand);
 
-        // 7. Handle post-exit interactions
+        // 8. Handle post-exit interactions
         await handlePostExit(defaultCommand);
 
     } catch (e) {

package/docker/manyoyo.Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 
 ARG TARGETARCH
 ARG NODE_VERSION=24
-ARG EXT=""
+ARG EXT="common"
 
 RUN <<EOX
     # 部署 system

package/docs/README_EN.md

@@ -23,19 +23,7 @@ Pre-installed with common agents and tools to further save tokens. Freely switch
 
 # Usage
 
-## 1. Install podman
-
-- Install [podman](https://podman.io/docs/installation)
-
-## 2. Build Image
-
-```
-podman pull ubuntu:24.04
-iv=1.4.0-all && podman build -t localhost/xcanwin/manyoyo:$iv -f docker/manyoyo.Dockerfile . --build-arg EXT=all --no-cache
-podman image prune -f
-```
-
-## 3. Install manyoyo (Choose One)
+## 1. Install manyoyo
 
 ### Global Installation (Recommended)
 
@@ -49,6 +37,32 @@ npm install -g @xcanwin/manyoyo
 npm install -g .
 ```
 
+## 2. Install podman
+
+- Install [podman](https://podman.io/docs/installation)
+
+## 3. Build Image
+
+After installing manyoyo, use the built-in command to build images:
+
+```bash
+# Pull base image
+podman pull ubuntu:24.04
+
+# Build using manyoyo (Recommended)
+manyoyo --ib all                     # Build all version (includes all tools)
+manyoyo --ib common                  # Build common version (basic version)
+manyoyo --ib go,codex,java,gemini    # Build go version (includes go,codex,java,gemini tools)
+
+# Custom image name and version
+manyoyo --ib all --in myimage --iv 2.0.0
+# Builds: myimage:2.0.0-all
+
+# Or build manually (Not recommended)
+iv=1.4.0 && podman build -t localhost/xcanwin/manyoyo:$iv-all -f docker/manyoyo.Dockerfile . --build-arg EXT=all --no-cache
+podman image prune -f
+```
+
 ## 4. Usage
 
 ### Basic Commands
@@ -189,6 +203,7 @@ manyoyo -n socket-dev -m mdsock -x docker ps
 | `-x CMD` | `--sf`, `--shell-full` | Full command (replaces --sp, -s, and --) |
 | `-y CLI` | `--yolo` | Run AI agent without confirmation |
 | `-m MODE` | `--cm`, `--cont-mode` | Set container mode (common, dind, mdsock) |
+| `--ib EXT` | `--image-build` | Build image, EXT is image variant (all, go, common) |
 | `--install NAME` | | Install manyoyo command |
 | `-V` | `--version` | Show version |
 | `-h` | `--help` | Show help |

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@xcanwin/manyoyo",
-  "version": "3.0.1",
+  "version": "3.1.0",
+  "imageVersion": "1.5.0",
   "description": "AI Agent CLI Security Sandbox",
   "keywords": [
     "ai", "agent", "sandbox", "docker", "cli", "container", "development"