From 0f2a7a6331bf30baa3c4c6db5fa2df8fba4a1044 Mon Sep 17 00:00:00 2001 From: yeasy Date: Fri, 13 Mar 2026 22:55:03 -0700 Subject: [PATCH] Fix install script variables, comment style, BuildKit syntax and placeholders --- 03_install/3.1_ubuntu.md | 2 +- 03_install/3.2_debian.md | 2 +- 03_install/3.4_centos.md | 4 ++-- 03_install/3.5_raspberry-pi.md | 10 +++++----- 10_buildx/10.1_buildkit.md | 2 +- 12_implementation/12.1_arch.md | 2 +- 17_ecosystem/17.3_podman.md | Bin 2513 -> 2512 bytes 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/03_install/3.1_ubuntu.md b/03_install/3.1_ubuntu.md index dc5c784..2336798 100644 --- a/03_install/3.1_ubuntu.md +++ b/03_install/3.1_ubuntu.md @@ -73,7 +73,7 @@ $ echo \ # 官方源 # $ echo \ # "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ -# $ stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +# $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` >以上命令会添加稳定版本的 Docker APT 镜像源，如果需要测试版本的 Docker 请将 stable 改为 test。 diff --git a/03_install/3.2_debian.md b/03_install/3.2_debian.md index 5c5c6d6..e92faa5 100644 --- a/03_install/3.2_debian.md +++ b/03_install/3.2_debian.md @@ -64,7 +64,7 @@ $ echo \ # 官方源 # $ echo \ # "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \ -# $ stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +# $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` >以上命令会添加稳定版本的 Docker APT 源，如果需要测试版本的 Docker 请将 stable 改为 test。Debian11 可能不使用 `/etc/apt/keyrings/`，如 gpg 错误可以考虑更换为 `/etc/apt/trusted.gpg.d`，见 [issue 15727](https://github.com/docker/docs/issues/15727)。 diff --git a/03_install/3.4_centos.md b/03_install/3.4_centos.md index 20cf785..2f00181 100644 --- a/03_install/3.4_centos.md +++ b/03_install/3.4_centos.md @@ -103,11 +103,11 @@ $ firewall-cmd --reload > 若你想安装测试版的 Docker，请从 test.docker.com 获取脚本 ```bash -## $ curl -fsSL test.docker.com -o get-docker.sh +# $ curl -fsSL test.docker.com -o get-docker.sh $ curl -fsSL get.docker.com -o get-docker.sh $ sudo sh get-docker.sh --mirror Aliyun -## $ sudo sh get-docker.sh --mirror AzureChinaCloud +# $ sudo sh get-docker.sh --mirror AzureChinaCloud ``` diff --git a/03_install/3.5_raspberry-pi.md b/03_install/3.5_raspberry-pi.md index 06aa32e..c507e99 100644 --- a/03_install/3.5_raspberry-pi.md +++ b/03_install/3.5_raspberry-pi.md @@ -59,8 +59,8 @@ $ echo \ # 官方源 # $ echo \ -# "deb [arch=$ signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/raspbian \ -# $ stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +# "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/raspbian \ +# $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` >以上命令会添加稳定版本的 Docker APT 源，如果需要测试版本的 Docker 请将 stable 改为 test。 @@ -90,7 +90,7 @@ $ echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docke ## 官方源 -## $ echo "deb [arch=$ signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/raspbian $ stable" | sudo tee -a /etc/apt/sources.list +# $ echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/raspbian $(lsb_release -cs) stable" | sudo tee -a /etc/apt/sources.list ``` @@ -111,11 +111,11 @@ $ sudo apt-get install docker-ce > 若你想安装测试版的 Docker，请从 test.docker.com 获取脚本 ```bash -## $ curl -fsSL test.docker.com -o get-docker.sh +# $ curl -fsSL test.docker.com -o get-docker.sh $ curl -fsSL get.docker.com -o get-docker.sh $ sudo sh get-docker.sh --mirror Aliyun -## $ sudo sh get-docker.sh --mirror AzureChinaCloud +# $ sudo sh get-docker.sh --mirror AzureChinaCloud ``` diff --git a/10_buildx/10.1_buildkit.md b/10_buildx/10.1_buildkit.md index 14d99f7..b164442 100644 --- a/10_buildx/10.1_buildkit.md +++ b/10_buildx/10.1_buildkit.md @@ -79,7 +79,7 @@ FROM nginx:alpine ## 为了更直观的说明 from 和 source 指令，这里使用 RUN 指令 RUN --mount=type=cache,target=/tmp/dist,from=builder,source=/app/dist \ - # --mount=type=cache,target/tmp/dist,from=my_app_dist,sharing=locked \ + # --mount=type=cache,target=/tmp/dist,from=my_app_dist,sharing=locked \ mkdir -p /app/dist && cp -r /tmp/dist/* /app/dist ``` diff --git a/12_implementation/12.1_arch.md b/12_implementation/12.1_arch.md index 5325980..614f1b8 100644 --- a/12_implementation/12.1_arch.md +++ b/12_implementation/12.1_arch.md @@ -112,7 +112,7 @@ flowchart TD ### 12.1.4 Docker Engine v29+ 变化 -从 Docker Engine v29 (2025/2026) 开始，架构进一步简化和标准化： +从 Docker Engine v29 (2025) 开始，架构进一步简化和标准化： - **Containerd 镜像存储 (Image Store)**：默认启用。Docker 直接使用 Containerd 的镜像管理能力，不再维护自己的一套 graphdriver。 - **优势**：多平台镜像支持更好、镜像拉取更快 (lazy pulling)、与 K8s 共享镜像。 diff --git a/17_ecosystem/17.3_podman.md b/17_ecosystem/17.3_podman.md index e0f3c9c66b7cde25c8eacf90ded4cc73fcf23df3..74a15b16b3186a41694505da6c728c2fcdb5622c 100644 GIT binary patch delta 17 Ycmca8d_j1E0b4+RN^WA_M)O&m06by_cmMzZ delta 18 Zcmca0d{KCU0Xu`Uzl*CO!$z}NoB%iX1!VvL