diff --git a/.vuepress/config.js b/.vuepress/config.js index 6889074..cd2a62e 100644 --- a/.vuepress/config.js +++ b/.vuepress/config.js @@ -36,54 +36,55 @@ module.exports = { docsRepo: 'yeasy/docker_practice', docsDir: '/', editLinks: true, - nav: [{ - text: '安装 Docker', - link: '/install/', - }, - { - text: 'Docker 入门', - link: '/' - }, - { - text: 'Docker 实战', - link: '/cases/os/' - }, - { - text: 'CI/CD', - link: '/cases/ci/' - }, - { - text: 'Docker 仓库', - link: '/repository/' - }, - { - text: '底层实现', - link: '/underly/', - }, - { - text: 'Compose', - link: '/compose/', - }, - { - text: 'Kubernetes', - link: '/kubernetes/', - }, - { - text: "云计算", - link: "/cloud/", - }, - { - text: 'GitHub', - link: 'https://github.com/yeasy/docker_practice' - }, - // { - // text: '捐赠', - // link: '' - // }, - { - text: '腾讯云容器服务', - link: 'https://cloud.tencent.com/act/cps/redirect?redirect=10058&cps_key=3a5255852d5db99dcd5da4c72f05df61' - }, + nav: [ + { + text: '微信交流群', + link: 'https://yewm28.coding-pages.com/wechat.jpg', + }, + { + text: '小程序', + link: 'https://yewm28.coding-pages.com/49682252-3ac4c500-faec-11e8-86ab-eafe0139be6b.jpg', + }, + { + text: '安装 Docker', + link: '/install/', + }, + { + text: 'Docker 入门', + link: '/' + }, + { + text: 'Docker 实战', + link: '/cases/os/' + }, + { + text: 'CI/CD', + link: '/cases/ci/' + }, + { + text: 'Compose', + link: '/compose/', + }, + { + text: 'Kubernetes', + link: '/kubernetes/', + }, + { + text: "云计算", + link: "/cloud/", + }, + { + text: 'GitHub', + link: 'https://github.com/yeasy/docker_practice' + }, + // { + // text: '捐赠', + // link: '' + // }, + { + text: '腾讯云容器服务', + link: 'https://cloud.tencent.com/act/cps/redirect?redirect=10058&cps_key=3a5255852d5db99dcd5da4c72f05df61' + }, // { // text: '语言', // items: [{ @@ -146,20 +147,6 @@ module.exports = { 'mirror', 'experimental', ], - '/underly/': [ - 'arch', - 'namespace', - 'cgroups', - 'ufs', - 'container_format', - 'network', - ], - '/repository/': [ - 'dockerhub', - 'registry', - 'registry_auth', - 'nexus3_registry', - ], '/cases/os/': [ { title: "操作系统", @@ -264,6 +251,17 @@ module.exports = { 'container/rm', ], }, + { + title: "Docker 仓库", + collapsable: false, + children: [ + 'repository/', + 'repository/dockerhub', + 'repository/registry', + 'repository/registry_auth', + 'repository/nexus3_registry', + ], + }, { title: "数据管理", collapsable: false, @@ -323,6 +321,19 @@ module.exports = { 'security/summary', ], }, + { + title: "底层实现", + collapsable: false, + children: [ + 'underly/', + 'underly/arch', + 'underly/namespace', + 'underly/cgroups', + 'underly/ufs', + 'underly/container_format', + 'underly/network', + ], + }, { title: "Docker Buildx", collapsable: false, @@ -353,14 +364,6 @@ module.exports = { 'coreos/install', ], }, - { - title: "Docker 开源项目", - collapsable: false, - children: [ - 'opensource/', - 'opensource/linuxkit', - ], - }, 'podman/', 'appendix/faq/', { diff --git a/SUMMARY.md b/SUMMARY.md index 3fba084..3392212 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -147,8 +147,6 @@ * [Travis CI](cases/ci/travis/README.md) * [在 IDE 中使用 Docker](ide/README.md) * [VS Code](ide/vsCode.md) -* [Docker 开源项目](opensource/README.md) - * [LinuxKit](opensource/linuxkit.md) * [podman - 下一代 Linux 容器工具](podman/README.md) * [附录](appendix/README.md) * [附录一:常见问题总结](appendix/faq/README.md) diff --git a/coreos/README.md b/coreos/README.md index 9fbf860..ca63655 100644 --- a/coreos/README.md +++ b/coreos/README.md @@ -1,6 +1,6 @@ # Fedora CoreOS -`CoreOS` 是一个专门为安全和大规模运行容器化工作负载而构建的新 Fedora 版本,它是 Fedora Atomic Host 和 CoreOS Container Linux 的后续项目。 +`CoreOS` 是一个专门为安全和大规模运行容器化工作负载而构建的新 Fedora 版本,它是 Fedora Atomic Host 和 CoreOS Container Linux 的后继项目。 `CoreOS` 的安装文件和运行依赖非常小,它提供了精简的 Linux 系统。它使用 Linux 容器在更高的抽象层来管理你的服务,而不是通过常规的包管理工具 `yum` 或 `apt` 来安装包。 diff --git a/image/dockerfile/copy.md b/image/dockerfile/copy.md index d12b446..0d48233 100644 --- a/image/dockerfile/copy.md +++ b/image/dockerfile/copy.md @@ -32,3 +32,5 @@ COPY --chown=bin files* /mydir/ COPY --chown=1 files* /mydir/ COPY --chown=10:11 files* /mydir/ ``` + +如果源路径为文件夹,复制的时候不是直接复制该文件夹,而是将文件夹中的内容复制到目标路径。 diff --git a/image/dockerfile/user.md b/image/dockerfile/user.md index 260b439..0fb7dab 100644 --- a/image/dockerfile/user.md +++ b/image/dockerfile/user.md @@ -18,7 +18,7 @@ RUN [ "redis-server" ] # 建立 redis 用户,并使用 gosu 换另一个用户执行命令 RUN groupadd -r redis && useradd -r -g redis redis # 下载 gosu -RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.7/gosu-amd64" \ +RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.12/gosu-amd64" \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true # 设置 CMD,并以另外的用户执行