From 49c4143e271d549ce8b672f14b7564a85f921cb7 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Sun, 21 Sep 2014 13:50:34 +0800 Subject: [PATCH] rename --- SUMMARY.md | 14 +++++++------- install/ubuntu144.md | 2 +- {container_security => security}/README.md | 2 +- {container_security => security}/control_group.md | 0 {container_security => security}/daemon_sec.md | 0 .../kernel_capability.md | 0 {container_security => security}/kernel_ns.md | 0 {container_security => security}/other_feature.md | 0 {container_security => security}/summary.md | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename {container_security => security}/README.md (93%) rename {container_security => security}/control_group.md (100%) rename {container_security => security}/daemon_sec.md (100%) rename {container_security => security}/kernel_capability.md (100%) rename {container_security => security}/kernel_ns.md (100%) rename {container_security => security}/other_feature.md (100%) rename {container_security => security}/summary.md (100%) diff --git a/SUMMARY.md b/SUMMARY.md index d8cc2f1..f8aa7ab 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -46,13 +46,13 @@ * [工具和示例](advanced_network/example.md) * [编辑网络配置文件](advanced_network/config_file.md) * [实例：创建一个点到点连接](advanced_network/ptp.md) -* [容器安全](container_security/README.md) - * [内核名字空间](container_security/kernel_ns.md) - * [控制组](container_security/control_group.md) - * [守护进程安全](container_security/daemon_sec.md) - * [内核权限](container_security/kernel_capability.md) - * [其他内核安全特性](container_security/other_feature.md) - * [结论](container_security/summary.md) +* [安全](security/README.md) + * [内核名字空间](security/kernel_ns.md) + * [控制组](security/control_group.md) + * [守护进程安全](security/daemon_sec.md) + * [内核权限](security/kernel_capability.md) + * [其他内核安全特性](security/other_feature.md) + * [结论](security/summary.md) * [Dockerfile](dockerfile/README.md) * [底层实现](underly/README.md) * [基本架构](underly/arch.md) diff --git a/install/ubuntu144.md b/install/ubuntu144.md index 03347f3..b366342 100644 --- a/install/ubuntu144.md +++ b/install/ubuntu144.md @@ -8,7 +8,7 @@ $ sudo ln -sf /usr/bin/docker.io /usr/local/bin/docker $ sudo sed -i '$acomplete -F _docker docker' /etc/bash_completion.d/docker.io ``` -如果使用操作系统自带包安装docker ，使用上面的办法，安装的版本是0.9.1 (不建议，因为1.0 生产版本已经发布，下面介绍安装方法） +如果使用操作系统自带包安装docker，使用上面的办法，安装的版本是0.9.1 (不建议，因为1.0 生产版本已经发布，下面介绍安装方法） ###通过docker源安装最新版本 如果要安装最新的docker版本，那么需要安装apt-get的https支持 diff --git a/container_security/README.md b/security/README.md similarity index 93% rename from container_security/README.md rename to security/README.md index ae209e0..a2305e7 100644 --- a/container_security/README.md +++ b/security/README.md @@ -1,4 +1,4 @@ -#容器安全 +#安全 评估Docker的安全性时，主要考虑3个方面: * 由内核中名字空间和控制组提供的容器的内在安全 * Docker程序本身的抗攻击性 diff --git a/container_security/control_group.md b/security/control_group.md similarity index 100% rename from container_security/control_group.md rename to security/control_group.md diff --git a/container_security/daemon_sec.md b/security/daemon_sec.md similarity index 100% rename from container_security/daemon_sec.md rename to security/daemon_sec.md diff --git a/container_security/kernel_capability.md b/security/kernel_capability.md similarity index 100% rename from container_security/kernel_capability.md rename to security/kernel_capability.md diff --git a/container_security/kernel_ns.md b/security/kernel_ns.md similarity index 100% rename from container_security/kernel_ns.md rename to security/kernel_ns.md diff --git a/container_security/other_feature.md b/security/other_feature.md similarity index 100% rename from container_security/other_feature.md rename to security/other_feature.md diff --git a/container_security/summary.md b/security/summary.md similarity index 100% rename from container_security/summary.md rename to security/summary.md