@xcanwin/manyoyo 3.4.5 → 3.5.0

package/README.md

@@ -1,4 +1,4 @@
-[English](docs/README_EN.md) | << [中文](README.md) >>
+[English](docs/README_EN.md) | **<[中文](README.md)>**
 
 ---
 
@@ -173,11 +173,10 @@ manyoyo -y oc         # 或: opencode
 # 创建支持 Docker-in-Docker 的容器
 manyoyo -n docker-dev -m dind -x /bin/bash
 
-# 在容器内启动 dockerd
-nohup dockerd &
+podman ps -a             # 现在可以在容器内使用 podman 命令
 
-# 现在可以在容器内使用 docker 命令
-docker ps -a
+nohup dockerd &          # 在容器内启动 dockerd
+docker ps -a             # 现在可以在容器内使用 docker 命令
 ```
 
 #### 挂载 Docker Socket 开发
@@ -185,10 +184,11 @@ docker ps -a
 ```bash
 # 挂载 Docker Socket（危险的！！！容器可以访问和执行宿主机的一切）
 # 创建挂载 /var/run/docker.sock 的容器
-manyoyo -n socket-dev -m mdsock -x /bin/bash
+manyoyo -n socket-dev -m sock -x /bin/bash
 
-# 现在可以在容器内使用 docker 命令
-docker ps -a
+podman ps -a             # 现在可以在容器内使用 podman 命令
+
+docker ps -a             # 现在可以在容器内使用 docker 命令
 ```
 
 ### 命令行选项
@@ -210,7 +210,7 @@ docker ps -a
 | `--` | `--ss`, `--shell-suffix` | 命令参数（作为 -s 的后缀） |
 | `-x CMD` | `--sf`, `--shell-full` | 完整命令（替代 --sp, -s 和 --） |
 | `-y CLI` | `--yolo` | 无需确认运行 AI 智能体 |
-| `-m MODE` | `--cm`, `--cont-mode` | 设置容器模式（common, dind, mdsock） |
+| `-m MODE` | `--cm`, `--cont-mode` | 设置容器模式（common, dind, sock） |
 | `--ib` | `--image-build` | 构建镜像 |
 | `--iba XXX=YYY` | `--image-build-arg` | 构建镜像时传参给dockerfile |
 | `--ip` | `--image-prune` | 清理悬空镜像和 `<none>` 镜像 |
@@ -229,8 +229,8 @@ docker ps -a
 
 ### 系统要求
 
-- Node.js >= 24.0.0
-- Docker 或 Podman
+- Node.js >= 22.0.0
+- Podman 或 Docker
 
 ### 卸载
 

package/bin/manyoyo.js

@@ -84,7 +84,7 @@ function showHelp() {
     console.log("  -y|--yolo CLI                    使AGENT无需确认 (代替-s命令)");
     console.log("                                   例如 claude / c, gemini / gm, codex / cx, opencode / oc");
     console.log("  -m|--cm|--cont-mode STRING       设置容器嵌套容器模式");
-    console.log("                                   例如 common, dind, mdsock");
+    console.log("                                   例如 common, dind, sock");
     console.log("  --ib|--image-build               构建镜像");
     console.log("  --iba|--image-build-arg XXX=YYY  构建镜像时传参给dockerfile");
     console.log("  --ip|--image-prune               清理悬空镜像和 <none> 镜像");
@@ -213,9 +213,9 @@ function setContMode(mode) {
             console.log(`${GREEN}✅ 开启安全的容器嵌套容器模式, 手动在容器内启动服务: nohup dockerd &${NC}`);
             break;
         case 'mount-docker-socket':
-        case 'mdsock':
+        case 'sock':
         case 's':
-            CONT_MODE = "--privileged --volume /var/run/docker.sock:/var/run/docker.sock";
+            CONT_MODE = "--privileged --volume /var/run/docker.sock:/var/run/docker.sock --env DOCKER_HOST=unix:///var/run/docker.sock --env CONTAINER_HOST=unix:///var/run/docker.sock";
             console.log(`${RED}⚠️ 开启危险的容器嵌套容器模式, 危害: 容器可访问宿主机文件${NC}`);
             break;
         default:

package/docker/manyoyo.Dockerfile

@@ -79,6 +79,11 @@ RUN <<EOX
                     tar zip unzip gzip make sqlite3 \
                     supervisor
 
+    # 安装 podman
+    case ",$TOOL," in *,full,*|*,podman,*)
+        apt-get install -y --no-install-recommends podman
+    ;; esac
+
     # 安装 docker
     case ",$TOOL," in *,full,*|*,docker,*)
         apt-get install -y --no-install-recommends docker.io

package/docs/README_EN.md

@@ -1,4 +1,4 @@
-<< [English](README_EN.md) >> | [中文](../README.md)
+**<[English](README_EN.md)>** | [中文](../README.md)
 
 ---
 
@@ -173,11 +173,10 @@ After exiting a container session, you'll be prompted with options:
 # Create a container with Docker-in-Docker support
 manyoyo -n docker-dev -m dind -x /bin/bash
 
-# Inside the container, start dockerd
-nohup dockerd &
+podman ps -a             # Now you can use podman commands inside the container
 
-# Now you can use docker commands inside the container
-docker ps -a
+nohup dockerd &          # Inside the container, start dockerd
+docker ps -a             # Now you can use docker commands inside the container
 ```
 
 #### Mount Docker socket Development
@@ -185,10 +184,11 @@ docker ps -a
 ```bash
 # Mount Docker socket (dangerous!!! containers can access and execute everything on the host)
 # Create a container mounting /var/run/docker.sock
-manyoyo -n socket-dev -m mdsock -x /bin/bash
+manyoyo -n socket-dev -m sock -x /bin/bash
 
-# Now you can use docker commands inside the container
-docker ps -a
+podman ps -a             # Now you can use podman commands inside the container
+
+docker ps -a             # Now you can use docker commands inside the container
 ```
 
 ### Command-Line Options
@@ -210,7 +210,7 @@ docker ps -a
 | `--` | `--ss`, `--shell-suffix` | Command arguments (suffix for -s) |
 | `-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) |
+| `-m MODE` | `--cm`, `--cont-mode` | Set container mode (common, dind, sock) |
 | `--ib` | `--image-build` | Build image |
 | `--iba` | `--image-build-arg` | Pass arguments to a Dockerfile during image build |
 | `--ip` | `--image-prune` | Clean dangling images and `<none>` images |
@@ -229,8 +229,8 @@ docker ps -a
 
 ### Requirements
 
-- Node.js >= 24.0.0
-- Docker or Podman
+- Node.js >= 22.0.0
+- Podman or Docker
 
 ### Uninstall
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xcanwin/manyoyo",
-  "version": "3.4.5",
-  "imageVersion": "1.6.2",
+  "version": "3.5.0",
+  "imageVersion": "1.6.3",
   "description": "AI Agent CLI Security Sandbox",
   "keywords": [
     "ai", "agent", "sandbox", "docker", "cli", "container", "development"
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/xcanwin/manyoyo",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=22.0.0"
   },
   "files": [
     "bin/manyoyo.js",