From 33af380be1b7c7845b88ff89520cebf5f1661a2f Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Sat, 21 Feb 2026 22:22:17 -0800 Subject: [PATCH] Restruct and reorder chapters --- 01_introduction/1.2_what.md | 2 +- 01_introduction/1.3_why.md | 2 +- 02_basic_concept/2.2_container.md | 2 +- 02_basic_concept/summary.md | 4 +- 04_image/4.7_internal.md | 2 +- 05_container/5.2_daemon.md | 2 +- 07_dockerfile/summary.md | 26 +-- 08_data_network/data/summary.md | 2 +- 10_compose/10.6_django.md | 2 +- .../18.1_arch.md | 6 +- .../18.2_namespace.md | 0 .../18.3_cgroups.md | 0 .../18.4_ufs.md | 0 .../18.5_container_format.md | 0 .../18.6_network.md | 0 .../README.md | 14 +- .../summary.md | 10 +- 11_ops/README.md | 7 - 11_ops/monitor/README.md | 20 -- .../README.md | 0 .../_images/k8s_architecture.png | Bin .../_images/kube-proxy.png | Bin .../_images/kubernetes_design.jpg | Bin .../_images/kubernetes_logo.png | Bin .../advanced.md | 0 .../concepts.md | 0 .../design.md | 0 .../intro.md | 0 .../practice.md | 0 12_orchestration/README.md | 8 - 13_ecosystem/README.md | 7 - .../setup => 13_kubernetes_setup}/README.md | 0 .../dashboard.md | 0 .../docker-desktop.md | 0 .../setup => 13_kubernetes_setup}/k3s.md | 0 .../setup => 13_kubernetes_setup}/kind.md | 0 .../kubeadm-docker.md | 0 .../setup => 13_kubernetes_setup}/kubeadm.md | 0 .../kubectl.md | 0 .../setup => 13_kubernetes_setup}/systemd.md | 0 {12_orchestration/etcd => 14_etcd}/README.md | 0 .../etcd => 14_etcd}/_images/etcd_logo.png | Bin {12_orchestration/etcd => 14_etcd}/cluster.md | 0 .../demo/cluster/docker-compose.yml | 0 {12_orchestration/etcd => 14_etcd}/etcdctl.md | 0 {12_orchestration/etcd => 14_etcd}/install.md | 0 {12_orchestration/etcd => 14_etcd}/intro.md | 0 {13_ecosystem/cloud => 15_cloud}/README.md | 0 .../cloud => 15_cloud}/_images/ECS.jpg | Bin .../_images/aliyun-logo.png | Bin .../cloud => 15_cloud}/_images/aws-logo.jpg | Bin .../_images/qcloud-logo.jpg | Bin {13_ecosystem/cloud => 15_cloud}/alicloud.md | 0 {13_ecosystem/cloud => 15_cloud}/aws.md | 0 {13_ecosystem/cloud => 15_cloud}/intro.md | 0 .../cloud => 15_cloud}/multicloud.md | 0 {13_ecosystem/cloud => 15_cloud}/summary.md | 0 .../cloud => 15_cloud}/tencentCloud.md | 0 16_ecosystem/README.md | 6 + .../coreos_README.md | 0 .../coreos_install.md | 0 .../intro.md => 16_ecosystem/coreos_intro.md | 0 .../coreos => 16_ecosystem}/demo/example.fcc | 0 .../README.md => 16_ecosystem/podman.md | 0 {11_ops/security => 17_security}/README.md | 8 +- .../security => 17_security}/control_group.md | 0 .../security => 17_security}/daemon_sec.md | 0 .../kernel_capability.md | 0 {11_ops/security => 17_security}/kernel_ns.md | 0 .../security => 17_security}/other_feature.md | 0 {11_ops/security => 17_security}/summary.md | 0 18_observability/README.md | 8 + {11_ops/logs => 18_observability}/elk.md | 0 .../logs_README.md | 0 .../prometheus.md | 0 {15_cases => 19_cases}/README.md | 2 +- {15_cases => 19_cases}/ci/README.md | 0 {15_cases => 19_cases}/ci/actions/README.md | 0 {15_cases => 19_cases}/ci/devops_workflow.md | 0 {15_cases => 19_cases}/ci/drone/.env.example | 0 {15_cases => 19_cases}/ci/drone/.gitignore | 0 {15_cases => 19_cases}/ci/drone/README.md | 0 .../ci/drone/demo/.drone.yml | 0 .../ci/drone/demo/README.md | 0 {15_cases => 19_cases}/ci/drone/demo/app.go | 0 .../ci/drone/docker-compose.yml | 0 {15_cases => 19_cases}/ci/drone/install.md | 0 {15_cases => 19_cases}/ide/README.md | 0 {15_cases => 19_cases}/ide/vsCode.md | 0 {15_cases => 19_cases}/os/README.md | 0 {15_cases => 19_cases}/os/alpine.md | 0 {15_cases => 19_cases}/os/busybox.md | 0 {15_cases => 19_cases}/os/centos.md | 0 {15_cases => 19_cases}/os/debian.md | 0 {15_cases => 19_cases}/os/summary.md | 0 SUMMARY.md | 180 +++++++++--------- .../20.1_best_practices.md | 0 .../16.2_debug.md => appendix/20.2_debug.md | 0 .../20.3_resources.md | 0 .../20.4_terminology.md | 0 .../20.5_editorial_style.md | 2 +- {16_appendix => appendix}/README.md | 12 +- .../_images/cmd_logic 2.graffle/data.plist | Bin .../_images/cmd_logic 2.graffle/image10.pdf | Bin .../_images/cmd_logic 2.graffle/image11.pdf | Bin .../_images/cmd_logic 2.graffle/image12.pdf | Bin .../_images/cmd_logic 2.graffle/image13.pdf | Bin .../_images/cmd_logic 2.graffle/image4.pdf | Bin .../_images/cmd_logic 2.graffle/image5.pdf | Bin .../_images/cmd_logic 2.graffle/image6.pdf | Bin .../_images/cmd_logic 2.graffle/image7.pdf | Bin .../_images/cmd_logic 2.graffle/image9.pdf | Bin .../_images/cmd_logic.dot | 0 .../_images/cmd_logic.dot.bak | 0 .../_images/cmd_logic.graffle/data.plist | Bin .../_images/cmd_logic.graffle/image10.pdf | Bin .../_images/cmd_logic.graffle/image11.pdf | Bin .../_images/cmd_logic.graffle/image12.pdf | Bin .../_images/cmd_logic.graffle/image13.pdf | Bin .../_images/cmd_logic.graffle/image4.pdf | Bin .../_images/cmd_logic.graffle/image5.pdf | Bin .../_images/cmd_logic.graffle/image6.pdf | Bin .../_images/cmd_logic.graffle/image7.pdf | Bin .../_images/cmd_logic.graffle/image9.pdf | Bin .../_images/container_status.dot | 0 {16_appendix => appendix}/command/README.md | 0 {16_appendix => appendix}/command/docker.md | 0 {16_appendix => appendix}/command/dockerd.md | 0 {16_appendix => appendix}/faq/README.md | 2 +- {16_appendix => appendix}/faq/errors.md | 0 {16_appendix => appendix}/repo/README.md | 0 {16_appendix => appendix}/repo/centos.md | 0 {16_appendix => appendix}/repo/minio.md | 0 {16_appendix => appendix}/repo/mongodb.md | 0 {16_appendix => appendix}/repo/mysql.md | 0 {16_appendix => appendix}/repo/nginx.md | 0 {16_appendix => appendix}/repo/nodejs.md | 0 {16_appendix => appendix}/repo/php.md | 0 {16_appendix => appendix}/repo/redis.md | 0 {16_appendix => appendix}/repo/ubuntu.md | 0 {16_appendix => appendix}/repo/wordpress.md | 0 141 files changed, 154 insertions(+), 182 deletions(-) rename 14_implementation/14.1_arch.md => 11_implementation/18.1_arch.md (96%) rename 14_implementation/14.2_namespace.md => 11_implementation/18.2_namespace.md (100%) rename 14_implementation/14.3_cgroups.md => 11_implementation/18.3_cgroups.md (100%) rename 14_implementation/14.4_ufs.md => 11_implementation/18.4_ufs.md (100%) rename 14_implementation/14.5_container_format.md => 11_implementation/18.5_container_format.md (100%) rename 14_implementation/14.6_network.md => 11_implementation/18.6_network.md (100%) rename {14_implementation => 11_implementation}/README.md (87%) rename {14_implementation => 11_implementation}/summary.md (83%) delete mode 100644 11_ops/README.md delete mode 100644 11_ops/monitor/README.md rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/README.md (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/_images/k8s_architecture.png (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/_images/kube-proxy.png (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/_images/kubernetes_design.jpg (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/_images/kubernetes_logo.png (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/advanced.md (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/concepts.md (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/design.md (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/intro.md (100%) rename {12_orchestration/kubernetes => 12_kubernetes_concepts}/practice.md (100%) delete mode 100644 12_orchestration/README.md delete mode 100644 13_ecosystem/README.md rename {12_orchestration/setup => 13_kubernetes_setup}/README.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/dashboard.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/docker-desktop.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/k3s.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/kind.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/kubeadm-docker.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/kubeadm.md (100%) rename 12_orchestration/kubectl/README.md => 13_kubernetes_setup/kubectl.md (100%) rename {12_orchestration/setup => 13_kubernetes_setup}/systemd.md (100%) rename {12_orchestration/etcd => 14_etcd}/README.md (100%) rename {12_orchestration/etcd => 14_etcd}/_images/etcd_logo.png (100%) rename {12_orchestration/etcd => 14_etcd}/cluster.md (100%) rename {12_orchestration/etcd => 14_etcd}/demo/cluster/docker-compose.yml (100%) rename {12_orchestration/etcd => 14_etcd}/etcdctl.md (100%) rename {12_orchestration/etcd => 14_etcd}/install.md (100%) rename {12_orchestration/etcd => 14_etcd}/intro.md (100%) rename {13_ecosystem/cloud => 15_cloud}/README.md (100%) rename {13_ecosystem/cloud => 15_cloud}/_images/ECS.jpg (100%) rename {13_ecosystem/cloud => 15_cloud}/_images/aliyun-logo.png (100%) rename {13_ecosystem/cloud => 15_cloud}/_images/aws-logo.jpg (100%) rename {13_ecosystem/cloud => 15_cloud}/_images/qcloud-logo.jpg (100%) rename {13_ecosystem/cloud => 15_cloud}/alicloud.md (100%) rename {13_ecosystem/cloud => 15_cloud}/aws.md (100%) rename {13_ecosystem/cloud => 15_cloud}/intro.md (100%) rename {13_ecosystem/cloud => 15_cloud}/multicloud.md (100%) rename {13_ecosystem/cloud => 15_cloud}/summary.md (100%) rename {13_ecosystem/cloud => 15_cloud}/tencentCloud.md (100%) create mode 100644 16_ecosystem/README.md rename 13_ecosystem/coreos/README.md => 16_ecosystem/coreos_README.md (100%) rename 13_ecosystem/coreos/install.md => 16_ecosystem/coreos_install.md (100%) rename 13_ecosystem/coreos/intro.md => 16_ecosystem/coreos_intro.md (100%) rename {13_ecosystem/coreos => 16_ecosystem}/demo/example.fcc (100%) rename 13_ecosystem/podman/README.md => 16_ecosystem/podman.md (100%) rename {11_ops/security => 17_security}/README.md (97%) rename {11_ops/security => 17_security}/control_group.md (100%) rename {11_ops/security => 17_security}/daemon_sec.md (100%) rename {11_ops/security => 17_security}/kernel_capability.md (100%) rename {11_ops/security => 17_security}/kernel_ns.md (100%) rename {11_ops/security => 17_security}/other_feature.md (100%) rename {11_ops/security => 17_security}/summary.md (100%) create mode 100644 18_observability/README.md rename {11_ops/logs => 18_observability}/elk.md (100%) rename 11_ops/logs/README.md => 18_observability/logs_README.md (100%) rename {11_ops/monitor => 18_observability}/prometheus.md (100%) rename {15_cases => 19_cases}/README.md (87%) rename {15_cases => 19_cases}/ci/README.md (100%) rename {15_cases => 19_cases}/ci/actions/README.md (100%) rename {15_cases => 19_cases}/ci/devops_workflow.md (100%) rename {15_cases => 19_cases}/ci/drone/.env.example (100%) rename {15_cases => 19_cases}/ci/drone/.gitignore (100%) rename {15_cases => 19_cases}/ci/drone/README.md (100%) rename {15_cases => 19_cases}/ci/drone/demo/.drone.yml (100%) rename {15_cases => 19_cases}/ci/drone/demo/README.md (100%) rename {15_cases => 19_cases}/ci/drone/demo/app.go (100%) rename {15_cases => 19_cases}/ci/drone/docker-compose.yml (100%) rename {15_cases => 19_cases}/ci/drone/install.md (100%) rename {15_cases => 19_cases}/ide/README.md (100%) rename {15_cases => 19_cases}/ide/vsCode.md (100%) rename {15_cases => 19_cases}/os/README.md (100%) rename {15_cases => 19_cases}/os/alpine.md (100%) rename {15_cases => 19_cases}/os/busybox.md (100%) rename {15_cases => 19_cases}/os/centos.md (100%) rename {15_cases => 19_cases}/os/debian.md (100%) rename {15_cases => 19_cases}/os/summary.md (100%) rename 16_appendix/16.1_best_practices.md => appendix/20.1_best_practices.md (100%) rename 16_appendix/16.2_debug.md => appendix/20.2_debug.md (100%) rename 16_appendix/16.3_resources.md => appendix/20.3_resources.md (100%) rename 16_appendix/16.4_terminology.md => appendix/20.4_terminology.md (100%) rename 16_appendix/16.5_editorial_style.md => appendix/20.5_editorial_style.md (97%) rename {16_appendix => appendix}/README.md (69%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/data.plist (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image10.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image11.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image12.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image13.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image4.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image5.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image6.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image7.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic 2.graffle/image9.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.dot (100%) rename {16_appendix => appendix}/_images/cmd_logic.dot.bak (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/data.plist (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image10.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image11.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image12.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image13.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image4.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image5.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image6.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image7.pdf (100%) rename {16_appendix => appendix}/_images/cmd_logic.graffle/image9.pdf (100%) rename {16_appendix => appendix}/_images/container_status.dot (100%) rename {16_appendix => appendix}/command/README.md (100%) rename {16_appendix => appendix}/command/docker.md (100%) rename {16_appendix => appendix}/command/dockerd.md (100%) rename {16_appendix => appendix}/faq/README.md (99%) rename {16_appendix => appendix}/faq/errors.md (100%) rename {16_appendix => appendix}/repo/README.md (100%) rename {16_appendix => appendix}/repo/centos.md (100%) rename {16_appendix => appendix}/repo/minio.md (100%) rename {16_appendix => appendix}/repo/mongodb.md (100%) rename {16_appendix => appendix}/repo/mysql.md (100%) rename {16_appendix => appendix}/repo/nginx.md (100%) rename {16_appendix => appendix}/repo/nodejs.md (100%) rename {16_appendix => appendix}/repo/php.md (100%) rename {16_appendix => appendix}/repo/redis.md (100%) rename {16_appendix => appendix}/repo/ubuntu.md (100%) rename {16_appendix => appendix}/repo/wordpress.md (100%) diff --git a/01_introduction/1.2_what.md b/01_introduction/1.2_what.md index f41e932..e4c9c1b 100644 --- a/01_introduction/1.2_what.md +++ b/01_introduction/1.2_what.md @@ -80,7 +80,7 @@ Docker 使用 [Go 语言](https://golang.google.cn/)开发，基于 Linux 内核 - **[Cgroups](https://zh.wikipedia.org/wiki/Cgroups)**：实现资源限制 (CPU、内存、I/O 等) - **[Union FS](https://en.wikipedia.org/wiki/Union_mount)**：实现分层存储 (如 OverlayFS) -> 如果你对这些底层技术感兴趣，可以阅读本书的[底层实现](../14_implementation/README.md)章节。 +> 如果你对这些底层技术感兴趣，可以阅读本书的[底层实现](../11_implementation/README.md)章节。 #### 概述 diff --git a/01_introduction/1.3_why.md b/01_introduction/1.3_why.md index 86437b6..5932671 100644 --- a/01_introduction/1.3_why.md +++ b/01_introduction/1.3_why.md @@ -161,7 +161,7 @@ flowchart LR - 构建过程 **可重复、可追溯** - 任何人都能从代码重建完全相同的镜像 -- 配合 [GitHub Actions](../15_cases/ci/actions/README.md) 等 CI 系统实现自动化 +- 配合 [GitHub Actions](../19_cases/ci/actions/README.md) 等 CI 系统实现自动化 #### 5。轻松迁移 diff --git a/02_basic_concept/2.2_container.md b/02_basic_concept/2.2_container.md index 82ff1a3..f547ba4 100644 --- a/02_basic_concept/2.2_container.md +++ b/02_basic_concept/2.2_container.md @@ -238,4 +238,4 @@ Docker 容器通过以下 Namespace 实现隔离： | **IPC** | 进程间通信 | 独立的信号量、消息队列 | | **USER** | 用户 | 独立的用户和组 ID | -> 想深入了解？请阅读[底层实现 - 命名空间](../14_implementation/14.2_namespace.md)。 +> 想深入了解？请阅读[底层实现 - 命名空间](../11_implementation/18.2_namespace.md)。 diff --git a/02_basic_concept/summary.md b/02_basic_concept/summary.md index faca797..a381c74 100644 --- a/02_basic_concept/summary.md +++ b/02_basic_concept/summary.md @@ -15,8 +15,8 @@ - [获取镜像](../04_image/4.1_pull.md)：从 Registry 下载镜像 - [使用 Dockerfile 定制镜像](../04_image/4.5_build.md)：创建自己的镜像 -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md)：构建高质量镜像的技巧 -- [底层实现 - 联合文件系统](../14_implementation/14.4_ufs.md)：深入理解分层存储的技术原理 +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md)：构建高质量镜像的技巧 +- [底层实现 - 联合文件系统](../11_implementation/18.4_ufs.md)：深入理解分层存储的技术原理 | 概念 | 要点 | |------|------| diff --git a/04_image/4.7_internal.md b/04_image/4.7_internal.md index 31fc27c..7dbfba6 100644 --- a/04_image/4.7_internal.md +++ b/04_image/4.7_internal.md @@ -62,4 +62,4 @@ Docker 使用联合文件系统 (Union FS) 来实现这种分层挂载。常见 虽然实现细节不同，但它们都遵循上述的 **分层 + CoW** 模型。 -> 想要深入了解 Overlay2 等文件系统的具体实现原理，包括 WorkDir、UpperDir、LowerDir 等底层细节，请阅读 **[第十四章底层实现](../14_implementation/README.md)** 中的 **[联合文件系统](../14_implementation/14.4_ufs.md)** 章节。 +> 想要深入了解 Overlay2 等文件系统的具体实现原理，包括 WorkDir、UpperDir、LowerDir 等底层细节，请阅读 **[第十一章 底层实现](../11_implementation/README.md)** 中的 **[联合文件系统](../11_implementation/18.4_ufs.md)** 章节。 diff --git a/05_container/5.2_daemon.md b/05_container/5.2_daemon.md index a9131a5..b698d48 100644 --- a/05_container/5.2_daemon.md +++ b/05_container/5.2_daemon.md @@ -255,6 +255,6 @@ $ docker attach mycontainer ### 延伸阅读 - [进入容器](5.4_attach_exec.md)：如何进入正在运行的容器执行命令 -- [容器日志](../16_appendix/16.1_best_practices.md)：生产环境的日志管理最佳实践 +- [容器日志](../appendix/20.1_best_practices.md)：生产环境的日志管理最佳实践 - [HEALTHCHECK 健康检查](../07_dockerfile/7.12_healthcheck.md)：自动检测容器内服务是否正常 - [Docker Compose](../10_compose/README.md)：管理多个后台容器的更好方式 diff --git a/07_dockerfile/summary.md b/07_dockerfile/summary.md index 428bec2..7f5c171 100644 --- a/07_dockerfile/summary.md +++ b/07_dockerfile/summary.md @@ -14,7 +14,7 @@ - [COPY 复制文件](7.2_copy.md)：文件复制 - [RUN 执行命令](../04_image/4.5_build.md)：执行构建命令 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 编写指南 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 编写指南 | 要点 | 说明 | |------|------| @@ -26,9 +26,9 @@ ### 延伸阅读 -- [安全](../11_ops/security/README.md)：容器安全实践 +- [安全](../17_security/README.md)：容器安全实践 - [ENTRYPOINT](7.5_entrypoint.md)：入口脚本中的用户切换 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 安全 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 安全 | 要点 | 说明 | |------|------| @@ -42,7 +42,7 @@ - [CMD 容器启动命令](7.4_cmd.md)：启动主进程 - [Compose 模板文件](../10_compose/10.5_compose_file.md)：Compose 中的健康检查 -- [Docker 调试](../16_appendix/16.2_debug.md)：容器排障 +- [Docker 调试](../appendix/20.2_debug.md)：容器排障 | 要点 | 说明 | |------|------| @@ -55,7 +55,7 @@ ### 延伸阅读 - [COPY 指令](7.2_copy.md)：文件复制 -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md)：基础镜像设计 +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md)：基础镜像设计 | 要点 | 说明 | |------|------| @@ -68,7 +68,7 @@ ### 延伸阅读 - [OCI 标签规范](https://github.com/opencontainers/image-spec/blob/main/annotations.md) -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md) +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md) | 要点 | 说明 | |------|------| @@ -81,7 +81,7 @@ ### 延伸阅读 - [RUN 指令](../04_image/4.5_build.md)：执行命令 -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md)：错误处理与调试 +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md)：错误处理与调试 | 要点 | 说明 | |------|------| @@ -95,7 +95,7 @@ - [CMD 容器启动命令](7.4_cmd.md)：容器启动时的命令 - [WORKDIR 指定工作目录](7.10_workdir.md)：改变目录 -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md) +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md) | 操作 | 示例 | |------|------| @@ -110,7 +110,7 @@ - [ADD 指令](7.3_add.md)：复制和解压 - [WORKDIR 指令](7.10_workdir.md)：设置工作目录 - [多阶段构建](7.17_multistage_builds.md)：优化镜像大小 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 编写指南 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 编写指南 | 场景 | 推荐指令 | |------|---------| @@ -124,7 +124,7 @@ - [COPY 复制文件](7.2_copy.md)：基本复制操作 - [多阶段构建](7.17_multistage_builds.md)：减少镜像体积 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 编写指南 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 编写指南 | 要点 | 说明 | |------|------| @@ -138,7 +138,7 @@ - [ENTRYPOINT 入口点](7.5_entrypoint.md)：固定的启动命令 - [后台运行](../05_container/5.2_daemon.md)：容器前台/后台概念 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 编写指南 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 编写指南 | ENTRYPOINT | CMD | 适用场景 | |------------|-----|---------| @@ -149,7 +149,7 @@ ### 延伸阅读 - [CMD 容器启动命令](7.4_cmd.md)：默认命令 -- [最佳实践](../16_appendix/16.1_best_practices.md)：启动命令设计 +- [最佳实践](../appendix/20.1_best_practices.md)：启动命令设计 - [后台运行](../05_container/5.2_daemon.md)：前台/后台概念 | 要点 | 说明 | @@ -164,7 +164,7 @@ - [ARG 构建参数](7.7_arg.md)：构建时变量 - [Compose 环境变量](../10_compose/10.5_compose_file.md)：Compose 中的环境变量 -- [最佳实践](../16_appendix/16.1_best_practices.md)：Dockerfile 编写指南 +- [最佳实践](../appendix/20.1_best_practices.md)：Dockerfile 编写指南 | 要点 | 说明 | |------|------| diff --git a/08_data_network/data/summary.md b/08_data_network/data/summary.md index b06a638..114b076 100644 --- a/08_data_network/data/summary.md +++ b/08_data_network/data/summary.md @@ -29,4 +29,4 @@ - [绑定挂载](bind-mounts.md)：挂载宿主机目录 - [tmpfs 挂载](tmpfs.md)：内存中的临时存储 -- [存储驱动](../../14_implementation/14.4_ufs.md)：Docker 存储的底层原理 +- [存储驱动](../../11_implementation/18.4_ufs.md)：Docker 存储的底层原理 diff --git a/10_compose/10.6_django.md b/10_compose/10.6_django.md index 64361b5..65e8d6f 100644 --- a/10_compose/10.6_django.md +++ b/10_compose/10.6_django.md @@ -370,5 +370,5 @@ services: - [Compose 模板文件详解](10.5_compose_file.md)：深入理解 Compose 文件的所有配置项 - [使用 WordPress](10.8_wordpress.md)：另一个 Compose 实战案例 -- [Dockerfile 最佳实践](../16_appendix/16.1_best_practices.md)：构建更小、更安全的镜像 +- [Dockerfile 最佳实践](../appendix/20.1_best_practices.md)：构建更小、更安全的镜像 - [数据管理](../08_data_network/README.md)：Volume 和数据持久化详解 diff --git a/14_implementation/14.1_arch.md b/11_implementation/18.1_arch.md similarity index 96% rename from 14_implementation/14.1_arch.md rename to 11_implementation/18.1_arch.md index 976f922..a32cb1b 100644 --- a/14_implementation/14.1_arch.md +++ b/11_implementation/18.1_arch.md @@ -154,6 +154,6 @@ flowchart TD ### 延伸阅读 -- [命名空间](./14.2_namespace.md)：Runc 如何隔离容器 -- [控制组](./14.3_cgroups.md)：Runc 如何限制资源 -- [联合文件系统](./14.4_ufs.md)：镜像如何存储 +- [命名空间](./18.2_namespace.md)：Runc 如何隔离容器 +- [控制组](./18.3_cgroups.md)：Runc 如何限制资源 +- [联合文件系统](./18.4_ufs.md)：镜像如何存储 diff --git a/14_implementation/14.2_namespace.md b/11_implementation/18.2_namespace.md similarity index 100% rename from 14_implementation/14.2_namespace.md rename to 11_implementation/18.2_namespace.md diff --git a/14_implementation/14.3_cgroups.md b/11_implementation/18.3_cgroups.md similarity index 100% rename from 14_implementation/14.3_cgroups.md rename to 11_implementation/18.3_cgroups.md diff --git a/14_implementation/14.4_ufs.md b/11_implementation/18.4_ufs.md similarity index 100% rename from 14_implementation/14.4_ufs.md rename to 11_implementation/18.4_ufs.md diff --git a/14_implementation/14.5_container_format.md b/11_implementation/18.5_container_format.md similarity index 100% rename from 14_implementation/14.5_container_format.md rename to 11_implementation/18.5_container_format.md diff --git a/14_implementation/14.6_network.md b/11_implementation/18.6_network.md similarity index 100% rename from 14_implementation/14.6_network.md rename to 11_implementation/18.6_network.md diff --git a/14_implementation/README.md b/11_implementation/README.md similarity index 87% rename from 14_implementation/README.md rename to 11_implementation/README.md index 9a985f5..ad9196d 100644 --- a/14_implementation/README.md +++ b/11_implementation/README.md @@ -1,4 +1,4 @@ -# 第十四章底层实现 +# 第十一章 底层实现 Docker 底层的核心技术包括 Linux 上的命名空间 (Namespaces)、控制组 (Control groups)、Union 文件系统 (Union file systems) 和容器格式 (Container format)。 @@ -12,9 +12,9 @@ Docker 底层的核心技术包括 Linux 上的命名空间 (Namespaces)、控 随着 Linux 系统对于命名空间功能的完善实现，程序员已经可以实现上面的所有需求，让某些进程在彼此隔离的命名空间中运行。大家虽然都共用一个内核和某些运行时环境 (例如一些系统命令和系统库)，但是彼此却看不到，都以为系统中只有自己的存在。这种机制就是容器 (Container)，利用命名空间来做权限的隔离控制，利用 cgroups 来做资源分配。 -* [基本架构](14.1_arch.md) -* [命名空间](14.2_namespace.md) -* [控制组](14.3_cgroups.md) -* [联合文件系统](14.4_ufs.md) -* [容器格式](14.5_container_format.md) -* [网络](14.6_network.md) +* [基本架构](18.1_arch.md) +* [命名空间](18.2_namespace.md) +* [控制组](18.3_cgroups.md) +* [联合文件系统](18.4_ufs.md) +* [容器格式](18.5_container_format.md) +* [网络](18.6_network.md) diff --git a/14_implementation/summary.md b/11_implementation/summary.md similarity index 83% rename from 14_implementation/summary.md rename to 11_implementation/summary.md index 3a1c84e..c81416c 100644 --- a/14_implementation/summary.md +++ b/11_implementation/summary.md @@ -13,9 +13,9 @@ ### 延伸阅读 -- [控制组 (Cgroups)](14.3_cgroups.md)：资源限制机制 -- [联合文件系统](14.4_ufs.md)：分层存储的实现 -- [安全](../11_ops/security/README.md)：容器安全实践 +- [控制组 (Cgroups)](18.3_cgroups.md)：资源限制机制 +- [联合文件系统](18.4_ufs.md)：分层存储的实现 +- [安全](../17_security/README.md)：容器安全实践 - [Linux Namespace 官方文档](https://man7.org/linux/man-pages/man7/namespaces.7.html) | 资源 | 限制参数 | 示例 | @@ -28,8 +28,8 @@ ### 延伸阅读 -- [命名空间](14.2_namespace.md)：资源隔离 -- [安全](../11_ops/security/README.md)：容器安全概述 +- [命名空间](18.2_namespace.md)：资源隔离 +- [安全](../17_security/README.md)：容器安全概述 - [Docker Stats](../05_container/README.md)：监控容器资源 | 概念 | 说明 | diff --git a/11_ops/README.md b/11_ops/README.md deleted file mode 100644 index a833e41..0000000 --- a/11_ops/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# 第十一章运维管理 - -本章将介绍 Docker 的运维管理，包括监控、日志与安全。 - -* [容器监控](monitor/README.md) -* [日志管理](logs/README.md) -* [安全](security/README.md) diff --git a/11_ops/monitor/README.md b/11_ops/monitor/README.md deleted file mode 100644 index 6e2cbc0..0000000 --- a/11_ops/monitor/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# 容器监控 - -容器化技术的普及使得应用部署变得更加灵活和高效，但也给监控带来了新的挑战。 - -在传统架构中，我们通常关注主机的 CPU、内存、磁盘 IO 等指标。而在容器环境下，除了主机层面的监控，我们更关注容器级别的资源使用情况、服务的运行状态以及编排系统的健康状况。 - -## 概述 - -总体概述了以下内容。 - -## 常见的监控方案 - -目前主流的容器监控方案包括： - -* **cAdvisor**：Google 开源的容器资源监控工具，Docker 原生支持。 -* **Prometheus**：CNCF 毕业项目，云原生时代最流行的监控系统。 -* **Grafana**：强大的可视化平台，常与 Prometheus 配合使用。 -* **ELK/EFK Stack**：主要用于日志管理，但也能提供一定的监控能力。 - -本章将重点介绍如何使用 Prometheus 和 Grafana 搭建一套完整的容器监控系统。 diff --git a/12_orchestration/kubernetes/README.md b/12_kubernetes_concepts/README.md similarity index 100% rename from 12_orchestration/kubernetes/README.md rename to 12_kubernetes_concepts/README.md diff --git a/12_orchestration/kubernetes/_images/k8s_architecture.png b/12_kubernetes_concepts/_images/k8s_architecture.png similarity index 100% rename from 12_orchestration/kubernetes/_images/k8s_architecture.png rename to 12_kubernetes_concepts/_images/k8s_architecture.png diff --git a/12_orchestration/kubernetes/_images/kube-proxy.png b/12_kubernetes_concepts/_images/kube-proxy.png similarity index 100% rename from 12_orchestration/kubernetes/_images/kube-proxy.png rename to 12_kubernetes_concepts/_images/kube-proxy.png diff --git a/12_orchestration/kubernetes/_images/kubernetes_design.jpg b/12_kubernetes_concepts/_images/kubernetes_design.jpg similarity index 100% rename from 12_orchestration/kubernetes/_images/kubernetes_design.jpg rename to 12_kubernetes_concepts/_images/kubernetes_design.jpg diff --git a/12_orchestration/kubernetes/_images/kubernetes_logo.png b/12_kubernetes_concepts/_images/kubernetes_logo.png similarity index 100% rename from 12_orchestration/kubernetes/_images/kubernetes_logo.png rename to 12_kubernetes_concepts/_images/kubernetes_logo.png diff --git a/12_orchestration/kubernetes/advanced.md b/12_kubernetes_concepts/advanced.md similarity index 100% rename from 12_orchestration/kubernetes/advanced.md rename to 12_kubernetes_concepts/advanced.md diff --git a/12_orchestration/kubernetes/concepts.md b/12_kubernetes_concepts/concepts.md similarity index 100% rename from 12_orchestration/kubernetes/concepts.md rename to 12_kubernetes_concepts/concepts.md diff --git a/12_orchestration/kubernetes/design.md b/12_kubernetes_concepts/design.md similarity index 100% rename from 12_orchestration/kubernetes/design.md rename to 12_kubernetes_concepts/design.md diff --git a/12_orchestration/kubernetes/intro.md b/12_kubernetes_concepts/intro.md similarity index 100% rename from 12_orchestration/kubernetes/intro.md rename to 12_kubernetes_concepts/intro.md diff --git a/12_orchestration/kubernetes/practice.md b/12_kubernetes_concepts/practice.md similarity index 100% rename from 12_orchestration/kubernetes/practice.md rename to 12_kubernetes_concepts/practice.md diff --git a/12_orchestration/README.md b/12_orchestration/README.md deleted file mode 100644 index 44b4a1f..0000000 --- a/12_orchestration/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# 第十二章容器编排 - -本章将介绍容器编排相关的技术与工具。 - -* [Etcd 项目](etcd/README.md) -* [Kubernetes - 开源容器编排引擎](kubernetes/README.md) -* [部署 Kubernetes](setup/README.md) -* [Kubernetes 命令行 kubectl](kubectl/README.md) diff --git a/13_ecosystem/README.md b/13_ecosystem/README.md deleted file mode 100644 index 7b43447..0000000 --- a/13_ecosystem/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# 第十三章容器生态 - -本章将介绍容器生态圈的相关项目与服务。 - -* [Fedora CoreOS](coreos/README.md) -* [容器与云计算](cloud/README.md) -* [podman - 下一代 Linux 容器工具](podman/README.md) diff --git a/12_orchestration/setup/README.md b/13_kubernetes_setup/README.md similarity index 100% rename from 12_orchestration/setup/README.md rename to 13_kubernetes_setup/README.md diff --git a/12_orchestration/setup/dashboard.md b/13_kubernetes_setup/dashboard.md similarity index 100% rename from 12_orchestration/setup/dashboard.md rename to 13_kubernetes_setup/dashboard.md diff --git a/12_orchestration/setup/docker-desktop.md b/13_kubernetes_setup/docker-desktop.md similarity index 100% rename from 12_orchestration/setup/docker-desktop.md rename to 13_kubernetes_setup/docker-desktop.md diff --git a/12_orchestration/setup/k3s.md b/13_kubernetes_setup/k3s.md similarity index 100% rename from 12_orchestration/setup/k3s.md rename to 13_kubernetes_setup/k3s.md diff --git a/12_orchestration/setup/kind.md b/13_kubernetes_setup/kind.md similarity index 100% rename from 12_orchestration/setup/kind.md rename to 13_kubernetes_setup/kind.md diff --git a/12_orchestration/setup/kubeadm-docker.md b/13_kubernetes_setup/kubeadm-docker.md similarity index 100% rename from 12_orchestration/setup/kubeadm-docker.md rename to 13_kubernetes_setup/kubeadm-docker.md diff --git a/12_orchestration/setup/kubeadm.md b/13_kubernetes_setup/kubeadm.md similarity index 100% rename from 12_orchestration/setup/kubeadm.md rename to 13_kubernetes_setup/kubeadm.md diff --git a/12_orchestration/kubectl/README.md b/13_kubernetes_setup/kubectl.md similarity index 100% rename from 12_orchestration/kubectl/README.md rename to 13_kubernetes_setup/kubectl.md diff --git a/12_orchestration/setup/systemd.md b/13_kubernetes_setup/systemd.md similarity index 100% rename from 12_orchestration/setup/systemd.md rename to 13_kubernetes_setup/systemd.md diff --git a/12_orchestration/etcd/README.md b/14_etcd/README.md similarity index 100% rename from 12_orchestration/etcd/README.md rename to 14_etcd/README.md diff --git a/12_orchestration/etcd/_images/etcd_logo.png b/14_etcd/_images/etcd_logo.png similarity index 100% rename from 12_orchestration/etcd/_images/etcd_logo.png rename to 14_etcd/_images/etcd_logo.png diff --git a/12_orchestration/etcd/cluster.md b/14_etcd/cluster.md similarity index 100% rename from 12_orchestration/etcd/cluster.md rename to 14_etcd/cluster.md diff --git a/12_orchestration/etcd/demo/cluster/docker-compose.yml b/14_etcd/demo/cluster/docker-compose.yml similarity index 100% rename from 12_orchestration/etcd/demo/cluster/docker-compose.yml rename to 14_etcd/demo/cluster/docker-compose.yml diff --git a/12_orchestration/etcd/etcdctl.md b/14_etcd/etcdctl.md similarity index 100% rename from 12_orchestration/etcd/etcdctl.md rename to 14_etcd/etcdctl.md diff --git a/12_orchestration/etcd/install.md b/14_etcd/install.md similarity index 100% rename from 12_orchestration/etcd/install.md rename to 14_etcd/install.md diff --git a/12_orchestration/etcd/intro.md b/14_etcd/intro.md similarity index 100% rename from 12_orchestration/etcd/intro.md rename to 14_etcd/intro.md diff --git a/13_ecosystem/cloud/README.md b/15_cloud/README.md similarity index 100% rename from 13_ecosystem/cloud/README.md rename to 15_cloud/README.md diff --git a/13_ecosystem/cloud/_images/ECS.jpg b/15_cloud/_images/ECS.jpg similarity index 100% rename from 13_ecosystem/cloud/_images/ECS.jpg rename to 15_cloud/_images/ECS.jpg diff --git a/13_ecosystem/cloud/_images/aliyun-logo.png b/15_cloud/_images/aliyun-logo.png similarity index 100% rename from 13_ecosystem/cloud/_images/aliyun-logo.png rename to 15_cloud/_images/aliyun-logo.png diff --git a/13_ecosystem/cloud/_images/aws-logo.jpg b/15_cloud/_images/aws-logo.jpg similarity index 100% rename from 13_ecosystem/cloud/_images/aws-logo.jpg rename to 15_cloud/_images/aws-logo.jpg diff --git a/13_ecosystem/cloud/_images/qcloud-logo.jpg b/15_cloud/_images/qcloud-logo.jpg similarity index 100% rename from 13_ecosystem/cloud/_images/qcloud-logo.jpg rename to 15_cloud/_images/qcloud-logo.jpg diff --git a/13_ecosystem/cloud/alicloud.md b/15_cloud/alicloud.md similarity index 100% rename from 13_ecosystem/cloud/alicloud.md rename to 15_cloud/alicloud.md diff --git a/13_ecosystem/cloud/aws.md b/15_cloud/aws.md similarity index 100% rename from 13_ecosystem/cloud/aws.md rename to 15_cloud/aws.md diff --git a/13_ecosystem/cloud/intro.md b/15_cloud/intro.md similarity index 100% rename from 13_ecosystem/cloud/intro.md rename to 15_cloud/intro.md diff --git a/13_ecosystem/cloud/multicloud.md b/15_cloud/multicloud.md similarity index 100% rename from 13_ecosystem/cloud/multicloud.md rename to 15_cloud/multicloud.md diff --git a/13_ecosystem/cloud/summary.md b/15_cloud/summary.md similarity index 100% rename from 13_ecosystem/cloud/summary.md rename to 15_cloud/summary.md diff --git a/13_ecosystem/cloud/tencentCloud.md b/15_cloud/tencentCloud.md similarity index 100% rename from 13_ecosystem/cloud/tencentCloud.md rename to 15_cloud/tencentCloud.md diff --git a/16_ecosystem/README.md b/16_ecosystem/README.md new file mode 100644 index 0000000..59056df --- /dev/null +++ b/16_ecosystem/README.md @@ -0,0 +1,6 @@ +# 第十六章 容器其它生态 + +本章将介绍 Docker 和 Kubernetes 之外的容器生态技术。 + +- **Fedora CoreOS**：专为容器化工作负载设计的操作系统。 +- **Podman**：兼容 Docker CLI 的下一代无守护进程容器引擎。 diff --git a/13_ecosystem/coreos/README.md b/16_ecosystem/coreos_README.md similarity index 100% rename from 13_ecosystem/coreos/README.md rename to 16_ecosystem/coreos_README.md diff --git a/13_ecosystem/coreos/install.md b/16_ecosystem/coreos_install.md similarity index 100% rename from 13_ecosystem/coreos/install.md rename to 16_ecosystem/coreos_install.md diff --git a/13_ecosystem/coreos/intro.md b/16_ecosystem/coreos_intro.md similarity index 100% rename from 13_ecosystem/coreos/intro.md rename to 16_ecosystem/coreos_intro.md diff --git a/13_ecosystem/coreos/demo/example.fcc b/16_ecosystem/demo/example.fcc similarity index 100% rename from 13_ecosystem/coreos/demo/example.fcc rename to 16_ecosystem/demo/example.fcc diff --git a/13_ecosystem/podman/README.md b/16_ecosystem/podman.md similarity index 100% rename from 13_ecosystem/podman/README.md rename to 16_ecosystem/podman.md diff --git a/11_ops/security/README.md b/17_security/README.md similarity index 97% rename from 11_ops/security/README.md rename to 17_security/README.md index 66fa08f..f0ec9f4 100644 --- a/11_ops/security/README.md +++ b/17_security/README.md @@ -43,7 +43,7 @@ flowchart LR | IPC | 进程通信 | 隔离共享内存 | | UTS | 主机名 | 独立主机名 | -详见[命名空间](../../14_implementation/14.2_namespace.md)章节。 +详见[命名空间](../../11_implementation/18.2_namespace.md)章节。 ### 2。控制组 @@ -419,6 +419,6 @@ $ cosign verify --key cosign.pub $IMAGE ## 延伸阅读 -- [命名空间](../../14_implementation/14.2_namespace.md)：隔离机制详解 -- [控制组](../../14_implementation/14.3_cgroups.md)：资源限制详解 -- [最佳实践](../../16_appendix/16.1_best_practices.md)：Dockerfile 安全配置 +- [命名空间](../../11_implementation/18.2_namespace.md)：隔离机制详解 +- [控制组](../../11_implementation/18.3_cgroups.md)：资源限制详解 +- [最佳实践](../../appendix/20.1_best_practices.md)：Dockerfile 安全配置 diff --git a/11_ops/security/control_group.md b/17_security/control_group.md similarity index 100% rename from 11_ops/security/control_group.md rename to 17_security/control_group.md diff --git a/11_ops/security/daemon_sec.md b/17_security/daemon_sec.md similarity index 100% rename from 11_ops/security/daemon_sec.md rename to 17_security/daemon_sec.md diff --git a/11_ops/security/kernel_capability.md b/17_security/kernel_capability.md similarity index 100% rename from 11_ops/security/kernel_capability.md rename to 17_security/kernel_capability.md diff --git a/11_ops/security/kernel_ns.md b/17_security/kernel_ns.md similarity index 100% rename from 11_ops/security/kernel_ns.md rename to 17_security/kernel_ns.md diff --git a/11_ops/security/other_feature.md b/17_security/other_feature.md similarity index 100% rename from 11_ops/security/other_feature.md rename to 17_security/other_feature.md diff --git a/11_ops/security/summary.md b/17_security/summary.md similarity index 100% rename from 11_ops/security/summary.md rename to 17_security/summary.md diff --git a/18_observability/README.md b/18_observability/README.md new file mode 100644 index 0000000..637e567 --- /dev/null +++ b/18_observability/README.md @@ -0,0 +1,8 @@ +# 第十八章 容器监控与日志 + +在生产环境中，容器化应用部署完成后，实时掌握容器集群的状态以及应用日志非常重要。本章将介绍针对 Docker 容器和 Kubernetes 集群的监控与日志管理方案。 + +我们将重点探讨以下内容： + +- **容器监控**：以 Prometheus 为主，讲解如何采集和展示容器性能指标。 +- **日志管理**：以 ELK (Elasticsearch, Logstash, Kibana) 套件为例，介绍集中式日志收集平台。 diff --git a/11_ops/logs/elk.md b/18_observability/elk.md similarity index 100% rename from 11_ops/logs/elk.md rename to 18_observability/elk.md diff --git a/11_ops/logs/README.md b/18_observability/logs_README.md similarity index 100% rename from 11_ops/logs/README.md rename to 18_observability/logs_README.md diff --git a/11_ops/monitor/prometheus.md b/18_observability/prometheus.md similarity index 100% rename from 11_ops/monitor/prometheus.md rename to 18_observability/prometheus.md diff --git a/15_cases/README.md b/19_cases/README.md similarity index 87% rename from 15_cases/README.md rename to 19_cases/README.md index 102a49e..9576aa9 100644 --- a/15_cases/README.md +++ b/19_cases/README.md @@ -1,4 +1,4 @@ -# 第十五章实战案例 +# 第十九章实战案例 本章将介绍 Docker 在不同场景下的实战案例。 diff --git a/15_cases/ci/README.md b/19_cases/ci/README.md similarity index 100% rename from 15_cases/ci/README.md rename to 19_cases/ci/README.md diff --git a/15_cases/ci/actions/README.md b/19_cases/ci/actions/README.md similarity index 100% rename from 15_cases/ci/actions/README.md rename to 19_cases/ci/actions/README.md diff --git a/15_cases/ci/devops_workflow.md b/19_cases/ci/devops_workflow.md similarity index 100% rename from 15_cases/ci/devops_workflow.md rename to 19_cases/ci/devops_workflow.md diff --git a/15_cases/ci/drone/.env.example b/19_cases/ci/drone/.env.example similarity index 100% rename from 15_cases/ci/drone/.env.example rename to 19_cases/ci/drone/.env.example diff --git a/15_cases/ci/drone/.gitignore b/19_cases/ci/drone/.gitignore similarity index 100% rename from 15_cases/ci/drone/.gitignore rename to 19_cases/ci/drone/.gitignore diff --git a/15_cases/ci/drone/README.md b/19_cases/ci/drone/README.md similarity index 100% rename from 15_cases/ci/drone/README.md rename to 19_cases/ci/drone/README.md diff --git a/15_cases/ci/drone/demo/.drone.yml b/19_cases/ci/drone/demo/.drone.yml similarity index 100% rename from 15_cases/ci/drone/demo/.drone.yml rename to 19_cases/ci/drone/demo/.drone.yml diff --git a/15_cases/ci/drone/demo/README.md b/19_cases/ci/drone/demo/README.md similarity index 100% rename from 15_cases/ci/drone/demo/README.md rename to 19_cases/ci/drone/demo/README.md diff --git a/15_cases/ci/drone/demo/app.go b/19_cases/ci/drone/demo/app.go similarity index 100% rename from 15_cases/ci/drone/demo/app.go rename to 19_cases/ci/drone/demo/app.go diff --git a/15_cases/ci/drone/docker-compose.yml b/19_cases/ci/drone/docker-compose.yml similarity index 100% rename from 15_cases/ci/drone/docker-compose.yml rename to 19_cases/ci/drone/docker-compose.yml diff --git a/15_cases/ci/drone/install.md b/19_cases/ci/drone/install.md similarity index 100% rename from 15_cases/ci/drone/install.md rename to 19_cases/ci/drone/install.md diff --git a/15_cases/ide/README.md b/19_cases/ide/README.md similarity index 100% rename from 15_cases/ide/README.md rename to 19_cases/ide/README.md diff --git a/15_cases/ide/vsCode.md b/19_cases/ide/vsCode.md similarity index 100% rename from 15_cases/ide/vsCode.md rename to 19_cases/ide/vsCode.md diff --git a/15_cases/os/README.md b/19_cases/os/README.md similarity index 100% rename from 15_cases/os/README.md rename to 19_cases/os/README.md diff --git a/15_cases/os/alpine.md b/19_cases/os/alpine.md similarity index 100% rename from 15_cases/os/alpine.md rename to 19_cases/os/alpine.md diff --git a/15_cases/os/busybox.md b/19_cases/os/busybox.md similarity index 100% rename from 15_cases/os/busybox.md rename to 19_cases/os/busybox.md diff --git a/15_cases/os/centos.md b/19_cases/os/centos.md similarity index 100% rename from 15_cases/os/centos.md rename to 19_cases/os/centos.md diff --git a/15_cases/os/debian.md b/19_cases/os/debian.md similarity index 100% rename from 15_cases/os/debian.md rename to 19_cases/os/debian.md diff --git a/15_cases/os/summary.md b/19_cases/os/summary.md similarity index 100% rename from 15_cases/os/summary.md rename to 19_cases/os/summary.md diff --git a/SUMMARY.md b/SUMMARY.md index 3622193..c3b1680 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -97,99 +97,99 @@ * [实战 Rails](10_compose/10.7_rails.md) * [实战 WordPress](10_compose/10.8_wordpress.md) * [实战 LNMP](10_compose/10.9_lnmp.md) -* [第十一章运维管理](11_ops/README.md) - * [容器监控](11_ops/monitor/README.md) - * [Prometheus](11_ops/monitor/prometheus.md) - * [日志管理](11_ops/logs/README.md) - * [ELK 套件](11_ops/logs/elk.md) - * [安全](11_ops/security/README.md) - * [内核命名空间](11_ops/security/kernel_ns.md) - * [控制组](11_ops/security/control_group.md) - * [服务端防护](11_ops/security/daemon_sec.md) - * [内核能力机制](11_ops/security/kernel_capability.md) - * [其它安全特性](11_ops/security/other_feature.md) - * [总结](11_ops/security/summary.md) ## 第三部分：深入篇 -* [第十二章容器编排](12_orchestration/README.md) - * [Etcd 项目](12_orchestration/etcd/README.md) - * [简介](12_orchestration/etcd/intro.md) - * [安装](12_orchestration/etcd/install.md) - * [集群](12_orchestration/etcd/cluster.md) - * [使用 etcdctl](12_orchestration/etcd/etcdctl.md) - * [Kubernetes - 开源容器编排引擎](12_orchestration/kubernetes/README.md) - * [简介](12_orchestration/kubernetes/intro.md) - * [基本概念](12_orchestration/kubernetes/concepts.md) - * [架构设计](12_orchestration/kubernetes/design.md) - * [高级特性](12_orchestration/kubernetes/advanced.md) - * [实战练习](12_orchestration/kubernetes/practice.md) - * [部署 Kubernetes](12_orchestration/setup/README.md) - * [使用 kubeadm 部署 Kubernetes (CRI 使用 containerd)](12_orchestration/setup/kubeadm.md) - * [使用 kubeadm 部署 Kubernetes (使用 Docker)](12_orchestration/setup/kubeadm-docker.md) - * [在 Docker Desktop 使用](12_orchestration/setup/docker-desktop.md) - * [Kind - Kubernetes IN Docker](12_orchestration/setup/kind.md) - * [K3s - 轻量级 Kubernetes](12_orchestration/setup/k3s.md) - * [一步步部署 Kubernetes 集群](12_orchestration/setup/systemd.md) - * [部署 Dashboard](12_orchestration/setup/dashboard.md) - * [Kubernetes 命令行 kubectl](12_orchestration/kubectl/README.md) -* [第十三章容器生态](13_ecosystem/README.md) - * [Fedora CoreOS](13_ecosystem/coreos/README.md) - * [简介](13_ecosystem/coreos/intro.md) - * [安装](13_ecosystem/coreos/install.md) - * [容器与云计算](13_ecosystem/cloud/README.md) - * [简介](13_ecosystem/cloud/intro.md) - * [腾讯云](13_ecosystem/cloud/tencentCloud.md) - * [阿里云](13_ecosystem/cloud/alicloud.md) - * [亚马逊云](13_ecosystem/cloud/aws.md) - * [小结](13_ecosystem/cloud/summary.md) - * [多云部署策略](13_ecosystem/cloud/multicloud.md) - * [podman - 下一代 Linux 容器工具](13_ecosystem/podman/README.md) -* [第十四章底层实现](14_implementation/README.md) - * [基本架构](14_implementation/14.1_arch.md) - * [命名空间](14_implementation/14.2_namespace.md) - * [控制组](14_implementation/14.3_cgroups.md) - * [联合文件系统](14_implementation/14.4_ufs.md) - * [容器格式](14_implementation/14.5_container_format.md) - * [网络](14_implementation/14.6_network.md) - * [本章小结](14_implementation/summary.md) +* [第十一章 底层实现](11_implementation/README.md) + * [基本架构](11_implementation/18.1_arch.md) + * [命名空间](11_implementation/18.2_namespace.md) + * [控制组](11_implementation/18.3_cgroups.md) + * [联合文件系统](11_implementation/18.4_ufs.md) + * [容器格式](11_implementation/18.5_container_format.md) + * [网络](11_implementation/18.6_network.md) + * [本章小结](11_implementation/summary.md) +* [第十二章 容器编排基础](12_kubernetes_concepts/README.md) + * [简介](12_kubernetes_concepts/intro.md) + * [基本概念](12_kubernetes_concepts/concepts.md) + * [架构设计](12_kubernetes_concepts/design.md) + * [高级特性](12_kubernetes_concepts/advanced.md) + * [实战练习](12_kubernetes_concepts/practice.md) +* [第十三章 部署 Kubernetes](13_kubernetes_setup/README.md) + * [使用 kubeadm 部署 Kubernetes (CRI 使用 containerd)](13_kubernetes_setup/kubeadm.md) + * [使用 kubeadm 部署 Kubernetes (使用 Docker)](13_kubernetes_setup/kubeadm-docker.md) + * [在 Docker Desktop 使用](13_kubernetes_setup/docker-desktop.md) + * [Kind - Kubernetes IN Docker](13_kubernetes_setup/kind.md) + * [K3s - 轻量级 Kubernetes](13_kubernetes_setup/k3s.md) + * [一步步部署 Kubernetes 集群](13_kubernetes_setup/systemd.md) + * [部署 Dashboard](13_kubernetes_setup/dashboard.md) + * [Kubernetes 命令行 kubectl](13_kubernetes_setup/kubectl.md) +* [第十四章 Etcd项目](14_etcd/README.md) + * [简介](14_etcd/intro.md) + * [安装](14_etcd/install.md) + * [集群](14_etcd/cluster.md) + * [使用 etcdctl](14_etcd/etcdctl.md) +* [第十五章 容器与云计算](15_cloud/README.md) + * [简介](15_cloud/intro.md) + * [腾讯云](15_cloud/tencentCloud.md) + * [阿里云](15_cloud/alicloud.md) + * [亚马逊云](15_cloud/aws.md) + * [小结](15_cloud/summary.md) + * [多云部署策略](15_cloud/multicloud.md) +* [第十六章 容器其它生态](16_ecosystem/README.md) + * [Fedora CoreOS 简介](16_ecosystem/coreos_intro.md) + * [Fedora CoreOS 安装](16_ecosystem/coreos_install.md) + * [podman - 下一代 Linux 容器工具](16_ecosystem/podman.md) ## 第四部分：实战篇 -* [第十五章实战案例](15_cases/README.md) - * [实战案例 - 操作系统](15_cases/os/README.md) - * [Busybox](15_cases/os/busybox.md) - * [Alpine](15_cases/os/alpine.md) - * [Debian Ubuntu](15_cases/os/debian.md) - * [CentOS Fedora](15_cases/os/centos.md) - * [本章小结](15_cases/os/summary.md) - * [实战案例 - CI/CD](15_cases/ci/README.md) - * [DevOps 完整工作流](15_cases/ci/devops_workflow.md) - * [GitHub Actions](15_cases/ci/actions/README.md) - * [Drone](15_cases/ci/drone/README.md) - * [部署 Drone](15_cases/ci/drone/install.md) - * [Drone Demo](15_cases/ci/drone/demo/README.md) - * [在 IDE 中使用 Docker](15_cases/ide/README.md) - * [VS Code](15_cases/ide/vsCode.md) -* [第十六章附录](16_appendix/README.md) - * [附录一：常见问题总结](16_appendix/faq/README.md) - * [常见错误速查表](16_appendix/faq/errors.md) - * [附录二：热门镜像介绍](16_appendix/repo/README.md) - * [Ubuntu](16_appendix/repo/ubuntu.md) - * [CentOS](16_appendix/repo/centos.md) - * [Nginx](16_appendix/repo/nginx.md) - * [PHP](16_appendix/repo/php.md) - * [Node.js](16_appendix/repo/nodejs.md) - * [MySQL](16_appendix/repo/mysql.md) - * [WordPress](16_appendix/repo/wordpress.md) - * [MongoDB](16_appendix/repo/mongodb.md) - * [Redis](16_appendix/repo/redis.md) - * [Minio](16_appendix/repo/minio.md) - * [附录三：Docker 命令查询](16_appendix/command/README.md) - * [客户端命令 - docker](16_appendix/command/docker.md) - * [服务端命令 - dockerd](16_appendix/command/dockerd.md) - * [附录四：Dockerfile 最佳实践](16_appendix/16.1_best_practices.md) - * [附录五：如何调试 Docker](16_appendix/16.2_debug.md) - * [附录六：资源链接](16_appendix/16.3_resources.md) - * [附录七：术语词表 (出版统一版)](16_appendix/16.4_terminology.md) - * [附录八：出版清稿规范 (图号与章节风格)](16_appendix/16.5_editorial_style.md) +* [第十七章 安全](17_security/README.md) + * [内核命名空间](17_security/kernel_ns.md) + * [控制组](17_security/control_group.md) + * [服务端防护](17_security/daemon_sec.md) + * [内核能力机制](17_security/kernel_capability.md) + * [其它安全特性](17_security/other_feature.md) + * [总结](17_security/summary.md) +* [第十八章 容器监控与日志](18_observability/README.md) + * [Prometheus](18_observability/prometheus.md) + * [ELK 套件](18_observability/elk.md) + * [小结](18_observability/logs_README.md) +* [第十九章实战案例](19_cases/README.md) + * [实战案例 - 操作系统](19_cases/os/README.md) + * [Busybox](19_cases/os/busybox.md) + * [Alpine](19_cases/os/alpine.md) + * [Debian Ubuntu](19_cases/os/debian.md) + * [CentOS Fedora](19_cases/os/centos.md) + * [本章小结](19_cases/os/summary.md) + * [实战案例 - CI/CD](19_cases/ci/README.md) + * [DevOps 完整工作流](19_cases/ci/devops_workflow.md) + * [GitHub Actions](19_cases/ci/actions/README.md) + * [Drone](19_cases/ci/drone/README.md) + * [部署 Drone](19_cases/ci/drone/install.md) + * [Drone Demo](19_cases/ci/drone/demo/README.md) + * [在 IDE 中使用 Docker](19_cases/ide/README.md) + * [VS Code](19_cases/ide/vsCode.md) + +## 附录 + +* [附录](appendix/README.md) + * [附录一：常见问题总结](appendix/faq/README.md) + * [常见错误速查表](appendix/faq/errors.md) + * [附录二：热门镜像介绍](appendix/repo/README.md) + * [Ubuntu](appendix/repo/ubuntu.md) + * [CentOS](appendix/repo/centos.md) + * [Nginx](appendix/repo/nginx.md) + * [PHP](appendix/repo/php.md) + * [Node.js](appendix/repo/nodejs.md) + * [MySQL](appendix/repo/mysql.md) + * [WordPress](appendix/repo/wordpress.md) + * [MongoDB](appendix/repo/mongodb.md) + * [Redis](appendix/repo/redis.md) + * [Minio](appendix/repo/minio.md) + * [附录三：Docker 命令查询](appendix/command/README.md) + * [客户端命令 - docker](appendix/command/docker.md) + * [服务端命令 - dockerd](appendix/command/dockerd.md) + * [附录四：Dockerfile 最佳实践](appendix/20.1_best_practices.md) + * [附录五：如何调试 Docker](appendix/20.2_debug.md) + * [附录六：资源链接](appendix/20.3_resources.md) + * [附录七：术语词表 (出版统一版)](appendix/20.4_terminology.md) + * [附录八：出版清稿规范 (图号与章节风格)](appendix/20.5_editorial_style.md) diff --git a/16_appendix/16.1_best_practices.md b/appendix/20.1_best_practices.md similarity index 100% rename from 16_appendix/16.1_best_practices.md rename to appendix/20.1_best_practices.md diff --git a/16_appendix/16.2_debug.md b/appendix/20.2_debug.md similarity index 100% rename from 16_appendix/16.2_debug.md rename to appendix/20.2_debug.md diff --git a/16_appendix/16.3_resources.md b/appendix/20.3_resources.md similarity index 100% rename from 16_appendix/16.3_resources.md rename to appendix/20.3_resources.md diff --git a/16_appendix/16.4_terminology.md b/appendix/20.4_terminology.md similarity index 100% rename from 16_appendix/16.4_terminology.md rename to appendix/20.4_terminology.md diff --git a/16_appendix/16.5_editorial_style.md b/appendix/20.5_editorial_style.md similarity index 97% rename from 16_appendix/16.5_editorial_style.md rename to appendix/20.5_editorial_style.md index 14081b0..34907c6 100644 --- a/16_appendix/16.5_editorial_style.md +++ b/appendix/20.5_editorial_style.md @@ -16,7 +16,7 @@ 2. 步骤型内容统一使用 “步骤 N：” 中文格式，不使用 `Step N:`。 3. 命令行示例统一以 `bash` 代码块展示，提示符统一为 `$`。 4. 关键提醒统一使用引用块 (`> 注意/提示/警告`)，避免正文中混杂多种强调样式。 -5. 章节内术语使用需遵循《[术语词表 (出版统一版)](16.4_terminology.md)》。 +5. 章节内术语使用需遵循《[术语词表 (出版统一版)](20.4_terminology.md)》。 ### 出版前自检清单 diff --git a/16_appendix/README.md b/appendix/README.md similarity index 69% rename from 16_appendix/README.md rename to appendix/README.md index 3c8168a..fd49703 100644 --- a/16_appendix/README.md +++ b/appendix/README.md @@ -1,4 +1,4 @@ -# 第十六章附录 +# 附录 本章包含了 Docker 相关的参考资料、常见问题解答以及最佳实践指南，旨在为读者提供便捷的查阅工具。 @@ -11,8 +11,8 @@ * [**常见问题总结 (FAQ)**](faq/README.md)：汇总了学习和使用 Docker 过程中的常见问题与错误解决方案。 * [**热门镜像介绍**](repo/README.md)：详细介绍了 Nginx，MySQL，Redis 等常用官方镜像的使用方法。 * [**Docker 命令查询**](command/README.md)：速查 Docker 客户端和服务端的常用命令。 -* [**Dockerfile 最佳实践**](16.1_best_practices.md)：提供编写高效、安全 Dockerfile 的指导原则。 -* [**如何调试 Docker**](16.2_debug.md)：介绍 Docker 调试技巧和工具。 -* [**资源链接**](16.3_resources.md)：推荐更多 Docker 相关的学习资源。 -* [**术语词表 (出版统一版)**](16.4_terminology.md)：统一全书中英文术语、缩写与命令写法。 -* [**出版清稿规范 (图号与章节风格)**](16.5_editorial_style.md)：统一图号命名、图题写法与章节风格。 +* [**Dockerfile 最佳实践**](20.1_best_practices.md)：提供编写高效、安全 Dockerfile 的指导原则。 +* [**如何调试 Docker**](20.2_debug.md)：介绍 Docker 调试技巧和工具。 +* [**资源链接**](20.3_resources.md)：推荐更多 Docker 相关的学习资源。 +* [**术语词表 (出版统一版)**](20.4_terminology.md)：统一全书中英文术语、缩写与命令写法。 +* [**出版清稿规范 (图号与章节风格)**](20.5_editorial_style.md)：统一图号命名、图题写法与章节风格。 diff --git a/16_appendix/_images/cmd_logic 2.graffle/data.plist b/appendix/_images/cmd_logic 2.graffle/data.plist similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/data.plist rename to appendix/_images/cmd_logic 2.graffle/data.plist diff --git a/16_appendix/_images/cmd_logic 2.graffle/image10.pdf b/appendix/_images/cmd_logic 2.graffle/image10.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image10.pdf rename to appendix/_images/cmd_logic 2.graffle/image10.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image11.pdf b/appendix/_images/cmd_logic 2.graffle/image11.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image11.pdf rename to appendix/_images/cmd_logic 2.graffle/image11.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image12.pdf b/appendix/_images/cmd_logic 2.graffle/image12.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image12.pdf rename to appendix/_images/cmd_logic 2.graffle/image12.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image13.pdf b/appendix/_images/cmd_logic 2.graffle/image13.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image13.pdf rename to appendix/_images/cmd_logic 2.graffle/image13.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image4.pdf b/appendix/_images/cmd_logic 2.graffle/image4.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image4.pdf rename to appendix/_images/cmd_logic 2.graffle/image4.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image5.pdf b/appendix/_images/cmd_logic 2.graffle/image5.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image5.pdf rename to appendix/_images/cmd_logic 2.graffle/image5.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image6.pdf b/appendix/_images/cmd_logic 2.graffle/image6.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image6.pdf rename to appendix/_images/cmd_logic 2.graffle/image6.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image7.pdf b/appendix/_images/cmd_logic 2.graffle/image7.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image7.pdf rename to appendix/_images/cmd_logic 2.graffle/image7.pdf diff --git a/16_appendix/_images/cmd_logic 2.graffle/image9.pdf b/appendix/_images/cmd_logic 2.graffle/image9.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic 2.graffle/image9.pdf rename to appendix/_images/cmd_logic 2.graffle/image9.pdf diff --git a/16_appendix/_images/cmd_logic.dot b/appendix/_images/cmd_logic.dot similarity index 100% rename from 16_appendix/_images/cmd_logic.dot rename to appendix/_images/cmd_logic.dot diff --git a/16_appendix/_images/cmd_logic.dot.bak b/appendix/_images/cmd_logic.dot.bak similarity index 100% rename from 16_appendix/_images/cmd_logic.dot.bak rename to appendix/_images/cmd_logic.dot.bak diff --git a/16_appendix/_images/cmd_logic.graffle/data.plist b/appendix/_images/cmd_logic.graffle/data.plist similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/data.plist rename to appendix/_images/cmd_logic.graffle/data.plist diff --git a/16_appendix/_images/cmd_logic.graffle/image10.pdf b/appendix/_images/cmd_logic.graffle/image10.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image10.pdf rename to appendix/_images/cmd_logic.graffle/image10.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image11.pdf b/appendix/_images/cmd_logic.graffle/image11.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image11.pdf rename to appendix/_images/cmd_logic.graffle/image11.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image12.pdf b/appendix/_images/cmd_logic.graffle/image12.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image12.pdf rename to appendix/_images/cmd_logic.graffle/image12.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image13.pdf b/appendix/_images/cmd_logic.graffle/image13.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image13.pdf rename to appendix/_images/cmd_logic.graffle/image13.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image4.pdf b/appendix/_images/cmd_logic.graffle/image4.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image4.pdf rename to appendix/_images/cmd_logic.graffle/image4.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image5.pdf b/appendix/_images/cmd_logic.graffle/image5.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image5.pdf rename to appendix/_images/cmd_logic.graffle/image5.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image6.pdf b/appendix/_images/cmd_logic.graffle/image6.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image6.pdf rename to appendix/_images/cmd_logic.graffle/image6.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image7.pdf b/appendix/_images/cmd_logic.graffle/image7.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image7.pdf rename to appendix/_images/cmd_logic.graffle/image7.pdf diff --git a/16_appendix/_images/cmd_logic.graffle/image9.pdf b/appendix/_images/cmd_logic.graffle/image9.pdf similarity index 100% rename from 16_appendix/_images/cmd_logic.graffle/image9.pdf rename to appendix/_images/cmd_logic.graffle/image9.pdf diff --git a/16_appendix/_images/container_status.dot b/appendix/_images/container_status.dot similarity index 100% rename from 16_appendix/_images/container_status.dot rename to appendix/_images/container_status.dot diff --git a/16_appendix/command/README.md b/appendix/command/README.md similarity index 100% rename from 16_appendix/command/README.md rename to appendix/command/README.md diff --git a/16_appendix/command/docker.md b/appendix/command/docker.md similarity index 100% rename from 16_appendix/command/docker.md rename to appendix/command/docker.md diff --git a/16_appendix/command/dockerd.md b/appendix/command/dockerd.md similarity index 100% rename from 16_appendix/command/dockerd.md rename to appendix/command/dockerd.md diff --git a/16_appendix/faq/README.md b/appendix/faq/README.md similarity index 99% rename from 16_appendix/faq/README.md rename to appendix/faq/README.md index 26274f2..d187690 100644 --- a/16_appendix/faq/README.md +++ b/appendix/faq/README.md @@ -29,7 +29,7 @@ * 如果安装应用时候需要配置一些特殊的环境变量，在安装后要还原不需要保持的变量值； * 使用 Dockerfile 创建镜像时候要添加。dockerignore 文件或使用干净的工作目录。 -更多内容请查看 [Dockerfile 最佳实践](../16.1_best_practices.md) +更多内容请查看 [Dockerfile 最佳实践](../20.1_best_practices.md) ### 碰到网络问题，无法 pull 镜像，命令行指定 http\_proxy 无效？ diff --git a/16_appendix/faq/errors.md b/appendix/faq/errors.md similarity index 100% rename from 16_appendix/faq/errors.md rename to appendix/faq/errors.md diff --git a/16_appendix/repo/README.md b/appendix/repo/README.md similarity index 100% rename from 16_appendix/repo/README.md rename to appendix/repo/README.md diff --git a/16_appendix/repo/centos.md b/appendix/repo/centos.md similarity index 100% rename from 16_appendix/repo/centos.md rename to appendix/repo/centos.md diff --git a/16_appendix/repo/minio.md b/appendix/repo/minio.md similarity index 100% rename from 16_appendix/repo/minio.md rename to appendix/repo/minio.md diff --git a/16_appendix/repo/mongodb.md b/appendix/repo/mongodb.md similarity index 100% rename from 16_appendix/repo/mongodb.md rename to appendix/repo/mongodb.md diff --git a/16_appendix/repo/mysql.md b/appendix/repo/mysql.md similarity index 100% rename from 16_appendix/repo/mysql.md rename to appendix/repo/mysql.md diff --git a/16_appendix/repo/nginx.md b/appendix/repo/nginx.md similarity index 100% rename from 16_appendix/repo/nginx.md rename to appendix/repo/nginx.md diff --git a/16_appendix/repo/nodejs.md b/appendix/repo/nodejs.md similarity index 100% rename from 16_appendix/repo/nodejs.md rename to appendix/repo/nodejs.md diff --git a/16_appendix/repo/php.md b/appendix/repo/php.md similarity index 100% rename from 16_appendix/repo/php.md rename to appendix/repo/php.md diff --git a/16_appendix/repo/redis.md b/appendix/repo/redis.md similarity index 100% rename from 16_appendix/repo/redis.md rename to appendix/repo/redis.md diff --git a/16_appendix/repo/ubuntu.md b/appendix/repo/ubuntu.md similarity index 100% rename from 16_appendix/repo/ubuntu.md rename to appendix/repo/ubuntu.md diff --git a/16_appendix/repo/wordpress.md b/appendix/repo/wordpress.md similarity index 100% rename from 16_appendix/repo/wordpress.md rename to appendix/repo/wordpress.md