Skip to content

Commit 6afeb23

Browse files
feat: upgrade the scripts, see details in PR (#49)
* feat: upgrade the scripts, see details in PR * fix: dead link
1 parent 6f459a7 commit 6afeb23

19 files changed

Lines changed: 2195 additions & 254 deletions

docker/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ FROM ubuntu:24.04 AS builder
1313

1414
ARG TOOLCHAIN_VERSION=15.2.rel1
1515
ARG TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu/${TOOLCHAIN_VERSION}/binrel/arm-gnu-toolchain-${TOOLCHAIN_VERSION}-x86_64-arm-none-linux-gnueabihf.tar.xz
16+
ARG VERBOSE=0
1617

1718
WORKDIR /build
1819

@@ -22,7 +23,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2223
ca-certificates \
2324
&& rm -rf /var/lib/apt/lists/*
2425

25-
RUN wget -q ${TOOLCHAIN_URL} -O toolchain.tar.xz \
26+
RUN if [ "$VERBOSE" = "1" ]; then \
27+
wget -v ${TOOLCHAIN_URL} -O toolchain.tar.xz; \
28+
else \
29+
wget --progress=bar:force:noscroll ${TOOLCHAIN_URL} -O toolchain.tar.xz; \
30+
fi \
2631
&& tar -xf toolchain.tar.xz \
2732
&& mv arm-gnu-toolchain-${TOOLCHAIN_VERSION}-x86_64-arm-none-linux-gnueabihf /opt/arm-gnu-toolchain \
2833
&& rm toolchain.tar.xz \

docker/Dockerfile.cn

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ FROM ubuntu:24.04 AS builder
1111

1212
ARG TOOLCHAIN_VERSION=15.2.rel1
1313
ARG TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu/${TOOLCHAIN_VERSION}/binrel/arm-gnu-toolchain-${TOOLCHAIN_VERSION}-x86_64-arm-none-linux-gnueabihf.tar.xz
14+
ARG VERBOSE=0
1415

1516
WORKDIR /build
1617

@@ -21,7 +22,11 @@ RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.aliyun.com@g' /etc/apt/sources.li
2122
ca-certificates \
2223
&& rm -rf /var/lib/apt/lists/*
2324

24-
RUN wget -q ${TOOLCHAIN_URL} -O toolchain.tar.xz \
25+
RUN if [ "$VERBOSE" = "1" ]; then \
26+
wget -v ${TOOLCHAIN_URL} -O toolchain.tar.xz; \
27+
else \
28+
wget --progress=bar:force:noscroll ${TOOLCHAIN_URL} -O toolchain.tar.xz; \
29+
fi \
2530
&& tar -xf toolchain.tar.xz \
2631
&& mv arm-gnu-toolchain-${TOOLCHAIN_VERSION}-x86_64-arm-none-linux-gnueabihf /opt/arm-gnu-toolchain \
2732
&& rm toolchain.tar.xz \

docker/README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,37 @@ docker build \
146146
.
147147
```
148148

149+
### 控制构建输出详细程度
150+
151+
`VERBOSE` 和 Docker 的进度输出是两层不同的开关:
152+
153+
- `--build-arg VERBOSE=1`:让 Dockerfile 里的 `wget` 使用详细输出
154+
- `--progress=plain`:让 BuildKit 不使用动态刷新界面,按普通日志逐行输出
155+
156+
```bash
157+
# 默认模式(显示进度条)
158+
docker build -t imx-forge:latest .
159+
160+
# 详细输出模式(推荐用于调试下载问题)
161+
docker build --progress=plain --build-arg VERBOSE=1 -t imx-forge:latest .
162+
163+
# 如果从项目根目录构建,请显式指定 Dockerfile 路径
164+
docker build --progress=plain --build-arg VERBOSE=1 -f docker/Dockerfile -t imx-forge:latest .
165+
166+
# 国内镜像源版本
167+
docker build --progress=plain --build-arg VERBOSE=1 -f docker/Dockerfile.cn -t imx-forge:latest .
168+
```
169+
170+
**参数说明**
171+
172+
| 参数 | 控制对象 | 效果 |
173+
|------|----------|------|
174+
| `VERBOSE=0` 或未设置 | Dockerfile 内部命令 | 使用默认下载输出 |
175+
| `VERBOSE=1` | Dockerfile 内部命令 | `wget` 使用详细输出 |
176+
| `--progress=plain` | Docker BuildKit 输出界面 | 禁用动态刷新,按普通日志逐行输出 |
177+
178+
**注意**:如果只设置 `--build-arg VERBOSE=1`,BuildKit 仍可能使用动态进度界面重绘终端,看起来像日志被覆盖。调试时优先使用 `--progress=plain`,通常不需要禁用 BuildKit。
179+
149180
### 持久化容器
150181

151182
创建一个持久化的开发容器:

document/todo/archive/v0.5-milestone.md

Lines changed: 0 additions & 228 deletions
This file was deleted.

document/todo/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
如果你是第一次了解 IMX-Forge,建议按以下顺序阅读:
88

99
1. **📖 [总体路线图](roadmap)** - 了解项目全貌和发展规划
10-
2. **📦 [v0.5 归档](archive/v0.5-milestone)** - 了解已完成的工作
10+
2. **📦 v0.5 里程碑** - Mainline 内核迁移 + QT6 支持已完成
1111
3. **🎯 [当前重点:D1 方向](directions/d1-environment)** - 查看环境完善方向
1212

1313
### 贡献者入口

document/todo/roadmap.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- [D3: 示例展示](./directions/d3-examples.md) - 11项
1515
- [D4: 生态成熟](./directions/d4-ecosystem.md) - 18项
1616
- 🔗 **GitHub Issue #47**[路线任务追踪](https://github.com/Awesome-Embedded-Learning-Studio/imx-forge/issues/47)
17-
- 📦 **已完成**[archive/v0.5-milestone.md](./archive/v0.5-milestone.md)
17+
- 📦 **已完成**:v0.5 里程碑(Mainline 内核迁移 + QT6 支持)
1818

1919
---
2020

@@ -172,7 +172,7 @@ P3 ──► 可选补充 (参考资源+更多项目)
172172
- ✅ WSL2 Mirrored 网络模式支持
173173
- ✅ 持续增长的完整教程体系
174174

175-
**详细记录**参见 [v0.5 归档](./archive/v0.5-milestone)
175+
**详细记录**:v0.5 里程碑已完成 Mainline 内核迁移和 QT6 支持
176176

177177
---
178178

document/todo/todo.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- [D3: 示例展示](directions/d3-examples) - 11项 (3工具 + 8文档)
1616
- [D4: 生态成熟](directions/d4-ecosystem) - 18项 (7工具 + 11文档)
1717
- 🎯 **示例项目**[projects/](projects/)
18-
- 📦 **已完成**[archive/v0.5-milestone.md](archive/v0.5-milestone)
18+
- 📦 **已完成**:v0.5 里程碑(Mainline 内核迁移 + QT6 支持)
1919
- 🔗 **GitHub Issue #47**[路线任务追踪](https://github.com/Awesome-Embedded-Learning-Studio/imx-forge/issues/47)
2020

2121
---
@@ -76,7 +76,7 @@ P3 ──► 可选补充 (参考资源+更多项目)
7676
- [x] **WSL2 Mirrored 网络模式**:Windows 用户无缝使用
7777
- [x] **完整教程体系**:持续增长的教程内容覆盖完整学习路径
7878

79-
**详细记录**参见 [v0.5 归档](archive/v0.5-milestone)
79+
**详细记录**:v0.5 里程碑已完成 Mainline 内核迁移和 QT6 支持
8080

8181
---
8282

0 commit comments

Comments
 (0)