From d31f26efb5fcbfc35fad242fb71aa001a765fd82 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:08:23 +0000 Subject: [PATCH] update --- docs/.vitepress/config.ts | 10 +++---- docs/en_US/guide/docker_build.md | 9 ++++++- docs/en_US/guide/docker_install.md | 30 ++++++++++----------- docs/guide/docker_build.md | 11 ++++++-- docs/guide/docker_install.md | 42 +++++++++++++++--------------- 5 files changed, 58 insertions(+), 44 deletions(-) diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index 4e741e348d..9baf2b4689 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -152,7 +152,7 @@ function getGuideSidebarZhCN() { text: 'Docker', items: [ { text: '系统和硬件配置要求', link: '/guide/docker_precheck.html' }, - { text: '主体安装', link: '/guide/docker_install.html' }, + { text: 'Docker主体安装', link: '/guide/docker_install.html' }, { text: 'Docker虚拟化', link: '/guide/docker_build.html' }, { text: '自定义', link: '/guide/docker_custom.html' }, { text: '致谢', link: '/guide/docker_thanks.html' }, @@ -207,7 +207,7 @@ function getGuideSidebarEnUS() { { text: 'Proxmox VE', items: [ - { text: 'System and hardware configuration requirements', link: '/en_US/guide/pve_precheck.html' }, + { text: 'Configuration requirements', link: '/en_US/guide/pve_precheck.html' }, { text: 'PVE main installation', link: '/en_US/guide/pve_install.html' }, { text: 'KVM Virtualization', link: '/en_US/guide/pve_kvm.html' }, { text: 'LXC Virtualization', link: '/en_US/guide/pve_lxc.html' }, @@ -219,7 +219,7 @@ function getGuideSidebarEnUS() { { text: 'LXD', items: [ - { text: 'System and hardware configuration requirements', link: '/en_US/guide/lxd_precheck.html' }, + { text: 'Configuration requirements', link: '/en_US/guide/lxd_precheck.html' }, { text: 'LXD main installation', link: '/en_US/guide/lxd_install.html' }, { text: 'LXC Virtualization', link: '/en_US/guide/lxd_lxc.html' }, { text: 'Extra configuration', link: '/en_US/guide/lxd_extra_config.html' }, @@ -231,8 +231,8 @@ function getGuideSidebarEnUS() { { text: 'Docker', items: [ - { text: 'System and hardware configuration requirements', link: '/en_US/guide/docker_precheck.html' }, - { text: 'Main installation', link: '/en_US/guide/docker_install.html' }, + { text: 'Configuration requirements', link: '/en_US/guide/docker_precheck.html' }, + { text: 'Docker main installation', link: '/en_US/guide/docker_install.html' }, { text: 'Docker Virtualization', link: '/en_US/guide/docker_build.html' }, { text: 'Custom', link: '/en_US/guide/docker_custom.html' }, { text: 'Acknowledgements', link: '/en_US/guide/docker_thanks.html' }, diff --git a/docs/en_US/guide/docker_build.md b/docs/en_US/guide/docker_build.md index 52dee8000d..9876c93f5f 100644 --- a/docs/en_US/guide/docker_build.md +++ b/docs/en_US/guide/docker_build.md @@ -28,7 +28,14 @@ Run ./onedocker.sh name cpu memory password sshport startport endport system independent_ipv6 ``` -Currently, the system only supports selecting Alpine or Debian, with Debian being the default choice. +Currently, the system only supports selecting: + +- alpine +- debian +- ubuntu +- almalinux + +with Debian being the default choice. The following is the information for the created example container: diff --git a/docs/en_US/guide/docker_install.md b/docs/en_US/guide/docker_install.md index 4a396158f5..aafb395ba7 100644 --- a/docs/en_US/guide/docker_install.md +++ b/docs/en_US/guide/docker_install.md @@ -8,21 +8,6 @@ Support for running Docker virtualization on various systems, including Linux, A If your host does not have an IPV6 subnet and you want to assign IPV6 addresses to containers, then please check the ``Customize`` partition in the ``LXD`` module for the ``Attach a free IPV6 address segment`` to the host, and attach an IPV6 subnet to the host before installing the environment. -## Environment Setup - -- Detect the system environment and install the corresponding components -- Install docker and docker-compose. -- Download some configuration scripts required by default -- Detect if there is an IPV6 address, check if it is greater than or equal to /64, and if so, configure the docker's ipv6 network. -- If all the above conditions are met, create ndpresponder docker and radvd so that IPV6 allocation supports ndp broadcasting and auto-allocation. -- Support for x86_64 and ARM architecture servers - -Command: - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh -``` - ## Setting Up Virtual Memory :::tip @@ -38,3 +23,18 @@ Command: ```shell curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh ``` + +## Environment Setup + +- Detect the system environment and install the corresponding components +- Install docker and docker-compose. +- Download some configuration scripts required by default +- Detect if there is an IPV6 address, check if it is greater than or equal to /64, and if so, configure the docker's ipv6 network. +- If all the above conditions are met, create ndpresponder docker and radvd so that IPV6 allocation supports ndp broadcasting and auto-allocation. +- Support for x86_64 and ARM architecture servers + +Command: + +```shell +curl -L https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh +``` \ No newline at end of file diff --git a/docs/guide/docker_build.md b/docs/guide/docker_build.md index 08ab28be81..5b631a6620 100644 --- a/docs/guide/docker_build.md +++ b/docs/guide/docker_build.md @@ -9,7 +9,7 @@ outline: deep ## 单独开设 - 只生成一个docker，这里有判断为国际服务器还是国内服务器，如果在国内服务器上开设，容器内的包管理源自动替换为清华源 -- 可配置绑定独立的IPV6地址，但需要先前使用本套脚本的环境安装命令安装的docker，且需要宿主机至少绑定了/64的IPV6子网 +- 可配置绑定独立的IPV6地址，但需要先前使用本套脚本的环境安装命令安装的docker，且需要宿主机至少绑定了/112的IPV6子网 - 支持x86_64和ARM架构的服务器 ### 下载脚本 @@ -34,7 +34,14 @@ curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/d ./onedocker.sh name cpu memory password sshport startport endport system independent_ipv6 ``` -目前system仅支持选择alpine或debian，默认是debian +目前system仅支持选择 + +- alpine +- debian +- ubuntu +- almalinux + +默认不填则是debian ```shell ./onedocker.sh test 1 512 123456 25000 34975 35000 debian N diff --git a/docs/guide/docker_install.md b/docs/guide/docker_install.md index 3855af385d..af4d3d9c29 100644 --- a/docs/guide/docker_install.md +++ b/docs/guide/docker_install.md @@ -9,27 +9,6 @@ outline: deep 如果你的宿主机本身没有IPV6的子网又想给容器分配IPV6地址，那么请先查看```LXD```模块中的```自定义```分区中的```给宿主机附加免费的IPV6地址段```的内容，给宿主机附加上IPV6子网后再进行环境安装 -## 环境预设 - -- 检测系统环境，安装对应组件 -- 安装docker和docker-compose，这里有判断为国际服务器还是国内服务器，自动安装对应源的docker -- 下载默认需要的一些配置脚本 -- 检测如果存在IPV6地址，检测其是否大于或等于/64，如果符合条件，则配置docker的ipv6的网络 -- 如果上述条件都符合，创建ndpresponder的docker和radvd，使得IPV6的分配支持ndp广播和自动分配 -- 支持x86_64和ARM架构的服务器 - -国际 - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh -``` - -国内 - -```shell -curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh -``` - ## 开设虚拟内存 :::tip @@ -51,3 +30,24 @@ curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o ```shell curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh ``` + +## 环境预设 + +- 检测系统环境，安装对应组件 +- 安装docker和docker-compose，这里有判断为国际服务器还是国内服务器，自动安装对应源的docker +- 下载默认需要的一些配置脚本 +- 检测如果存在IPV6地址，检测其是否大于或等于/112，如果符合条件，则配置docker的ipv6的网络 +- 如果上述条件都符合，创建ndpresponder的docker和radvd，使得IPV6的分配支持ndp广播和自动分配 +- 支持x86_64和ARM架构的服务器 + +国际 + +```shell +curl -L https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh +``` + +国内 + +```shell +curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/docker/main/scripts/dockerinstall.sh -o dockerinstall.sh && chmod +x dockerinstall.sh && bash dockerinstall.sh +```