♻️ 迁移 docker compose 并修复 runner 升级版本识别
Ubuntu System Information / show-system-info (push) Successful in 1s
Ubuntu System Information / show-system-info (push) Successful in 1s
This commit is contained in:
+46
-46
@@ -119,14 +119,14 @@ cd docker-runner/presets/standard-ubuntu-22/
|
||||
#### 3. 构建并启动容器
|
||||
|
||||
```bash
|
||||
docker-compose build
|
||||
docker-compose up -d
|
||||
docker compose build
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
#### 4. 安装 Runner
|
||||
|
||||
```bash
|
||||
docker-compose exec gitea-runner /data/setup.sh
|
||||
docker compose exec gitea-runner /data/setup.sh
|
||||
```
|
||||
|
||||
脚本会自动探测最新 `act_runner` 版本作为默认值,然后提示你确认架构。
|
||||
@@ -134,7 +134,7 @@ docker-compose exec gitea-runner /data/setup.sh
|
||||
#### 5. 注册 Runner
|
||||
|
||||
```bash
|
||||
docker-compose exec gitea-runner /data/register.sh
|
||||
docker compose exec gitea-runner /data/register.sh
|
||||
```
|
||||
|
||||
输入你的 Gitea 实例 URL 和注册令牌。
|
||||
@@ -145,10 +145,10 @@ Runner 注册后会自动启动,无需重启容器。
|
||||
|
||||
```bash
|
||||
# 查看容器日志
|
||||
docker-compose logs -f
|
||||
docker compose logs -f
|
||||
|
||||
# 查看 runner 状态
|
||||
docker-compose exec gitea-runner /data/manage.sh status
|
||||
docker compose exec gitea-runner /data/manage.sh status
|
||||
```
|
||||
|
||||
---
|
||||
@@ -178,8 +178,8 @@ environment:
|
||||
#### 3. 构建并启动
|
||||
|
||||
```bash
|
||||
docker-compose build
|
||||
docker-compose up -d
|
||||
docker compose build
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
#### 4. 验证 Buildx 初始化
|
||||
@@ -190,18 +190,18 @@ docker-compose up -d
|
||||
# ✓ arm64 support verified
|
||||
# ✓ amd64 support verified
|
||||
# ✓ Buildx configured successfully!
|
||||
docker-compose logs -f
|
||||
docker compose logs -f
|
||||
|
||||
# 进入容器验证
|
||||
docker-compose exec gitea-runner docker buildx ls
|
||||
docker compose exec gitea-runner docker buildx ls
|
||||
# 应该看到 gitea-multiarch builder
|
||||
```
|
||||
|
||||
#### 5. 安装和注册
|
||||
|
||||
```bash
|
||||
docker-compose exec gitea-runner /data/setup.sh
|
||||
docker-compose exec gitea-runner /data/register.sh
|
||||
docker compose exec gitea-runner /data/setup.sh
|
||||
docker compose exec gitea-runner /data/register.sh
|
||||
```
|
||||
|
||||
Runner 注册后会自动启动。
|
||||
@@ -216,52 +216,52 @@ Runner 注册后会自动启动。
|
||||
|
||||
```bash
|
||||
# 列出所有 runners
|
||||
docker-compose exec gitea-runner /data/manage.sh list
|
||||
docker compose exec gitea-runner /data/manage.sh list
|
||||
|
||||
# 查看所有 runners 状态
|
||||
docker-compose exec gitea-runner /data/manage.sh status
|
||||
docker compose exec gitea-runner /data/manage.sh status
|
||||
```
|
||||
|
||||
### 日志管理
|
||||
|
||||
```bash
|
||||
# 查看日志(最后 50 行)
|
||||
docker-compose exec gitea-runner /data/manage.sh logs <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh logs <runner-name>
|
||||
|
||||
# 指定行数
|
||||
docker-compose exec gitea-runner /data/manage.sh logs <runner-name> 100
|
||||
docker compose exec gitea-runner /data/manage.sh logs <runner-name> 100
|
||||
|
||||
# 实时跟踪日志
|
||||
docker-compose exec gitea-runner /data/manage.sh follow <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh follow <runner-name>
|
||||
```
|
||||
|
||||
### Runner 控制
|
||||
|
||||
```bash
|
||||
# 启动 runner
|
||||
docker-compose exec gitea-runner /data/manage.sh start <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh start <runner-name>
|
||||
|
||||
# 停止 runner
|
||||
docker-compose exec gitea-runner /data/manage.sh stop <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh stop <runner-name>
|
||||
|
||||
# 重启 runner
|
||||
docker-compose exec gitea-runner /data/manage.sh restart <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh restart <runner-name>
|
||||
|
||||
# 删除 runner
|
||||
docker-compose exec gitea-runner /data/manage.sh delete <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh delete <runner-name>
|
||||
```
|
||||
|
||||
### 升级 act_runner
|
||||
|
||||
```bash
|
||||
# 自动检查最新稳定版本,下载后重启所有已注册 runners
|
||||
docker-compose exec gitea-runner /data/upgrade.sh
|
||||
docker compose exec gitea-runner /data/upgrade.sh
|
||||
|
||||
# 指定版本
|
||||
docker-compose exec gitea-runner /data/upgrade.sh --version 0.6.1
|
||||
docker compose exec gitea-runner /data/upgrade.sh --version 0.6.1
|
||||
|
||||
# 仅重启指定 runner
|
||||
docker-compose exec gitea-runner /data/upgrade.sh --runner <runner-name>
|
||||
docker compose exec gitea-runner /data/upgrade.sh --runner <runner-name>
|
||||
```
|
||||
|
||||
`upgrade.sh` 只替换 `/data/bin/act_runner` 并重启 runner 进程,不会重新注册,也不需要重新输入 token。
|
||||
@@ -270,14 +270,14 @@ docker-compose exec gitea-runner /data/upgrade.sh --runner <runner-name>
|
||||
|
||||
```bash
|
||||
# 注册新的 runner(使用不同名称)
|
||||
docker-compose exec gitea-runner /data/register.sh
|
||||
docker compose exec gitea-runner /data/register.sh
|
||||
```
|
||||
|
||||
### 交互式管理
|
||||
|
||||
```bash
|
||||
# 运行交互式菜单
|
||||
docker-compose exec gitea-runner /data/manage.sh
|
||||
docker compose exec gitea-runner /data/manage.sh
|
||||
```
|
||||
|
||||
---
|
||||
@@ -405,24 +405,24 @@ CMD ["/app"]
|
||||
### Q1: 如何更新 Runner 版本?
|
||||
|
||||
```bash
|
||||
docker-compose exec gitea-runner /data/upgrade.sh
|
||||
docker compose exec gitea-runner /data/upgrade.sh
|
||||
# 脚本会自动从官方目录页检测最新 act_runner 版本
|
||||
```
|
||||
|
||||
如需固定版本:
|
||||
|
||||
```bash
|
||||
docker-compose exec gitea-runner /data/upgrade.sh --version 0.6.1
|
||||
docker compose exec gitea-runner /data/upgrade.sh --version 0.6.1
|
||||
```
|
||||
|
||||
### Q2: 如何添加多个 Runners?
|
||||
|
||||
```bash
|
||||
# 多次运行注册脚本,每次使用不同名称
|
||||
docker-compose exec gitea-runner /data/register.sh
|
||||
docker compose exec gitea-runner /data/register.sh
|
||||
|
||||
# 查看所有 runners
|
||||
docker-compose exec gitea-runner /data/manage.sh list
|
||||
docker compose exec gitea-runner /data/manage.sh list
|
||||
```
|
||||
|
||||
### Q3: 容器启动失败 "exec format error"
|
||||
@@ -440,36 +440,36 @@ cd docker-runner/presets/<your-preset>/
|
||||
sed -i 's/\r$//' ../../common/*.sh
|
||||
|
||||
# 重新构建
|
||||
docker-compose down
|
||||
docker-compose build --no-cache
|
||||
docker-compose up -d
|
||||
docker compose down
|
||||
docker compose build --no-cache
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### Q4: 如何完全重置?
|
||||
|
||||
```bash
|
||||
# 停止并删除容器和卷
|
||||
docker-compose down -v
|
||||
docker compose down -v
|
||||
|
||||
# 删除数据目录
|
||||
rm -rf runner-data
|
||||
|
||||
# 重新构建
|
||||
docker-compose build --no-cache
|
||||
docker-compose up -d
|
||||
docker compose build --no-cache
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### Q5: 如何查看日志?
|
||||
|
||||
```bash
|
||||
# 容器日志
|
||||
docker-compose logs -f
|
||||
docker compose logs -f
|
||||
|
||||
# Runner 日志
|
||||
docker-compose exec gitea-runner /data/manage.sh logs <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh logs <runner-name>
|
||||
|
||||
# 实时跟踪日志
|
||||
docker-compose exec gitea-runner /data/manage.sh follow <runner-name>
|
||||
docker compose exec gitea-runner /data/manage.sh follow <runner-name>
|
||||
```
|
||||
|
||||
### Q6: Buildx 版 - 构建速度慢?
|
||||
@@ -508,7 +508,7 @@ platforms: ${{ github.ref == 'refs/heads/main' && 'linux/amd64,linux/arm64' || '
|
||||
|
||||
```bash
|
||||
# 进入容器
|
||||
docker-compose exec gitea-runner bash
|
||||
docker compose exec gitea-runner bash
|
||||
|
||||
# 检查 builder
|
||||
docker buildx ls
|
||||
@@ -536,7 +536,7 @@ docker system df
|
||||
|
||||
```bash
|
||||
# 进入容器
|
||||
docker-compose exec gitea-runner bash
|
||||
docker compose exec gitea-runner bash
|
||||
|
||||
# 清理构建缓存(保留 builder)
|
||||
docker buildx prune
|
||||
@@ -552,10 +552,10 @@ docker buildx rm gitea-multiarch
|
||||
|
||||
```bash
|
||||
# 1. 停止所有容器
|
||||
docker-compose down
|
||||
docker compose down
|
||||
|
||||
# 2. 清理 Buildx(如果使用 Buildx 版)
|
||||
docker-compose exec gitea-runner docker buildx rm gitea-multiarch
|
||||
docker compose exec gitea-runner docker buildx rm gitea-multiarch
|
||||
|
||||
# 3. 清理未使用的镜像
|
||||
docker image prune -a
|
||||
@@ -593,7 +593,7 @@ runner-data/
|
||||
```bash
|
||||
# 1. 停止当前容器
|
||||
cd docker-runner/presets/<current-preset>/
|
||||
docker-compose down
|
||||
docker compose down
|
||||
|
||||
# 2. 切换到新预设
|
||||
cd ../buildx-ubuntu-22/
|
||||
@@ -602,8 +602,8 @@ cd ../buildx-ubuntu-22/
|
||||
cp -r ../standard-ubuntu-22/runner-data .
|
||||
|
||||
# 4. 启动新预设
|
||||
docker-compose build
|
||||
docker-compose up -d
|
||||
docker compose build
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
Reference in New Issue
Block a user