Commit 65afbcb
committed
feat(instance): 为 instance exec 命令添加 --shell 和 --workdir 参数
- 新增 --shell 参数:支持指定使用的 shell(如 /bin/sh, /bin/bash),解决 Alpine 等镜像只有 sh 的问题
- 新增 --workdir 参数:支持自定义初始工作目录,解决默认强制进入 /code 目录的问题
- 新增 --no-workdir 参数:不 cd 到任何目录,直接使用容器的 WORKDIR
- 保持完全向后兼容:不传参数时行为与之前完全一致
问题背景:
1. 当前 instance exec 硬编码使用 bash,导致只有 sh 的镜像(如 Alpine)无法使用
2. 默认强制尝试进入 /code 目录,对于使用其他工作目录的容器不够灵活
解决方案:
1. --shell 参数允许用户指定 shell 类型,默认值为 bash
2. --workdir 参数支持三种模式:
- 不指定:默认行为,尝试 cd /code || cd /
- 指定路径:cd 到指定目录
- 空字符串或 --no-workdir:不执行 cd,直接使用容器默认 WORKDIR
Signed-off-by: hugh.li <hugh.li@foxmail.com>1 parent 918bcbd commit 65afbcb
2 files changed
+31
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
13 | 16 | | |
14 | 17 | | |
15 | 18 | | |
16 | | - | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
17 | 23 | | |
18 | 24 | | |
19 | 25 | | |
| |||
23 | 29 | | |
24 | 30 | | |
25 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
26 | 35 | | |
27 | 36 | | |
28 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
| 20 | + | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
61 | 63 | | |
62 | 64 | | |
63 | 65 | | |
| |||
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
74 | 79 | | |
75 | 80 | | |
76 | | - | |
| 81 | + | |
77 | 82 | | |
78 | | - | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
79 | 96 | | |
80 | 97 | | |
81 | 98 | | |
| |||
0 commit comments