update

oneclickvirt · Feb 22, 2024 · 9c15305 · 9c15305
1 parent 606fcb5
commit 9c15305
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 45 deletions.
diff --git a/docs/en/guide/incus/incus_lxc.md b/docs/en/guide/incus/incus_lxc.md
@@ -4,6 +4,29 @@ outline: deep
 
 # incus virtualization
 
+## Images available for creating LXC Containers
+
+A portion of the available system parameters are shown here for your reference:
+
+- debian10, debian11, debian12
+- ubuntu18, ubuntu20, ubuntu22
+- centos8, centos9 (actually opened out of the Stream version)
+- alpine3.15, alpine3.16, alpine3.17, alpine3.18
+- openwrt21，openwrt22，fedora37，fedora38，fedora39
+- rockylinux8，rockylinux9，oralce8，oracle9
+- oralce7，centos7 (CGroupV1 needs to be enabled in GRUB or it won't start.)
+- kali，archlinux
+
+* Note that **the combination of lowercase letters + numbers** or **only lowercase letters**, try it yourself, if the search is not the system will automatically exit the script
+* The version number can be with English decimal point, in order to adapt to the alpine version number has been supported.
+* If you can't open it, it may be that the hard disk is not big enough or it doesn't fit the host, try it by yourself.
+* The images currently in use are triple filtered and prioritized: [self-hosted](https://github.com/oneclickvirt/incus_images)、[official-hosted](https://images.linuxcontainers.org/)、[tuna-images-hosted](https://mirrors.tuna.tsinghua.edu.cn/lxc-images/)
+* A complete list of supported systems for self-compiling images: [https://github.com/oneclickvirt/incus_images/blob/main/fixed_images.txt](https://github.com/oneclickvirt/incus_images/blob/main/fixed_images.txt)
+
+:::tip
+The version number has ended the long-term maintenance of the general no longer have an official mirror, temporarily did not find the archive address of the historical mirror, if you find welcome to leave a message I will add support!
+:::
+
 ## Generate only one NAT server
 
 - Generate only one NAT server, with customizable restrictions on all content.
@@ -28,25 +51,7 @@ Memory size is calculated in MB, hard disk size is calculated in GB, download sp
 
 If ```external start port`` and ```external stop port`` are both set to 0, then we don't do interval port mapping, only the basic SSH port is mapped, note that ```can't be null``, and it needs to be set to 0 if it's not to be mapped.
 
-Support for customizing the system of the server, do not fill out the default use of debian11 when left blank, note that the incoming parameters for the system name + version number, such as:
-
-- debian10, debian11, debian12
-- ubuntu18, ubuntu20, ubuntu22
-- centos8, centos9 (actually opened out of the Stream version)
-- alpine3.15, alpine3.16, alpine3.17, alpine3.18
-- openwrt21，openwrt22，fedora37，fedora38，fedora39
-- rockylinux8，rockylinux9，oralce8，oracle9
-- oralce7，centos7 (CGroupV1 needs to be enabled in GRUB or it won't start.)
-- kali，archlinux
-
-* Note that the combination of lowercase letters + numbers or only lowercase letters, try it yourself, if the search is not the system will automatically exit the script
-* The version number can be with English decimal point, in order to adapt to the alpine version number has been supported.
-* If you can't open it, it may be that the hard disk is not big enough or it doesn't fit the host, try it by yourself.
-* The images currently in use are triple filtered and prioritized: [self-hosted](https://github.com/oneclickvirt/incus_images)、[official-hosted](https://images.linuxcontainers.org/)、[tuna-images-hosted](https://mirrors.tuna.tsinghua.edu.cn/lxc-images/)
-
-:::tip
-The version number has ended the long-term maintenance of the general no longer have an official mirror, temporarily did not find the archive address of the historical mirror, if you find welcome to leave a message I will add support!
-:::
+Support custom server system, do not fill in the leave blank default use debian11, pay attention to the incoming parameters for the system name + version number
 
 ### Example
 

diff --git a/docs/en/guide/pve/pve_lxc.md b/docs/en/guide/pve/pve_lxc.md
@@ -8,6 +8,12 @@ outline: deep
 
 **x86_64:**
 
+Auto-patching images: https://github.com/oneclickvirt/lxc_amd64_images/blob/main/fixed_images.txt
+
+:::tip
+Automated daily pulls for compilation and patching
+:::
+
 Self-patching images: https://github.com/oneclickvirt/pve_lxc_images/blob/main/fixed_images.txt
 
 :::tip
@@ -34,12 +40,12 @@ All system parameters are lowercase system names spliced with version numbers, e
 (Self-patched images support some out-of-the-way systems, such as centos6, centos7, debian8, debian9, etc.)
 :::
 
+**The default CT username for all systems is root**
+
 :::tip
-Of course, sometimes there are special cases where the version may be current/base, in which case it is sufficient to use only the English system name, e.g. archlinux, gentoo.
+Of course, sometimes there are special cases where the version may be current/base, in which case it is sufficient to use only the English system name, e.g. archlinux, gentoo, kali.
 :::
 
-**The default CT username for all systems is root**
-
 ## Creating Individual LXC Containers for Virtualization
 
 :::warning

diff --git a/docs/guide/incus/incus_lxc.md b/docs/guide/incus/incus_lxc.md
@@ -4,6 +4,29 @@ outline: deep
 
 # LXC虚拟化
 
+## 开设LXC容器可使用的镜像
+
+这里展示一部分可使用的系统参数供你参考：
+
+- debian10，debian11，debian12
+- ubuntu18，ubuntu20，ubuntu22
+- centos8，centos9 (实际开设出来都是Stream版本)
+- alpine3.15，alpine3.16，alpine3.17，alpine3.18
+- openwrt21，openwrt22，fedora37，fedora38，fedora39
+- rockylinux8，rockylinux9，oralce8，oracle9
+- oralce7，centos7 (都需要在GRUB中启用CGroupV1否则无法启动，详细介绍见常见问题答疑)
+- kali，archlinux
+
+* 注意都是**小写字母+数字**的组合或**仅小写字母**，自行尝试，如果搜索无该系统则会自动退出脚本
+* 版本号可以带英文小数点，为了适配alpine的版本号已支持
+* 开不起来的可能是硬盘或内存不够大或者本身就不适配宿主机，自行尝试查看开不起来的报错
+* 目前使用的容器系统有三重筛选，优先级：[自编译](https://github.com/oneclickvirt/incus_images)、[官方](https://images.linuxcontainers.org/)、[清华源](https://mirrors.tuna.tsinghua.edu.cn/lxc-images/)
+* 自编译镜像完整的支持系统的列表：[https://github.com/oneclickvirt/incus_images/blob/main/fixed_images.txt](https://github.com/oneclickvirt/incus_images/blob/main/fixed_images.txt)
+
+:::tip
+版本号中已结束长期维护的一般不再有官方系统镜像了，暂时未找到历史镜像的存档地址，如果有找到欢迎留言我会添加支持
+:::
+
 ## 单独生成一个NAT服务器
 
 - 只生成一个NAT服务器，可自定义限制所有内容
@@ -34,25 +57,7 @@ CPU核数需要小于或等于宿主机的核数，内存大小以MB计算，硬
 
 如果```外网起端口```和```外网止端口```都设置为0则不做区间外网端口映射了，只映射基础的SSH端口，注意```不能为空```，不进行映射需要设置为0
 
-支持自定义服务器的系统，不填写留空时默认使用debian11，注意传入参数为系统名字+版本号，如：
-
-- debian10，debian11，debian12
-- ubuntu18，ubuntu20，ubuntu22
-- centos8，centos9 (实际开设出来都是Stream版本)
-- alpine3.15，alpine3.16，alpine3.17，alpine3.18
-- openwrt21，openwrt22，fedora37，fedora38，fedora39
-- rockylinux8，rockylinux9，oralce8，oracle9
-- oralce7，centos7 (都需要在GRUB中启用CGroupV1否则无法启动，详细介绍见常见问题答疑)
-- kali，archlinux
-
-* 注意都是小写字母+数字的组合或仅小写字母，自行尝试，如果搜索无该系统则会自动退出脚本
-* 版本号可以带英文小数点，为了适配alpine的版本号已支持
-* 开不起来的可能是硬盘或内存不够大或者本身就不适配宿主机，自行尝试查看开不起来的报错
-* 目前使用的容器系统有三重筛选，优先级：[自编译](https://github.com/oneclickvirt/incus_images)、[官方](https://images.linuxcontainers.org/)、[清华源](https://mirrors.tuna.tsinghua.edu.cn/lxc-images/)
-
-:::tip
-版本号中已结束长期维护的一般不再有官方系统镜像了，暂时未找到历史镜像的存档地址，如果有找到欢迎留言我会添加支持
-:::
+支持自定义服务器的系统，不填写留空时默认使用debian11，注意传入参数为系统名字+版本号
 
 ### 示例
 

diff --git a/docs/guide/pve/pve_lxc.md b/docs/guide/pve/pve_lxc.md
@@ -8,7 +8,13 @@ outline: deep
 
 **x86_64：**
 
-自修补镜像: https://github.com/oneclickvirt/pve_lxc_images/blob/main/fixed_images.txt
+自动修补镜像：https://github.com/oneclickvirt/lxc_amd64_images/blob/main/fixed_images.txt
+
+:::tip
+每日自动拉取进行编译和修补
+:::
+
+手动修补镜像: https://github.com/oneclickvirt/pve_lxc_images/blob/main/fixed_images.txt
 
 :::tip
 其中的部分镜像有缺陷，不保证所有PVE可用，名字为 ```ubuntu16.04```、```debian6```、```centos7```、```opensuse42.2```、```opensuse42.3``` 非必要不要使用。
@@ -33,12 +39,12 @@ outline: deep
 (自修补镜像支持一些偏门系统，如 centos6、centos7、debian8、debian9 等)
 :::
 
+**所有系统的CT默认用户名是root**
+
 :::tip
-当然有时候会存在特殊情况，version可能是current/base，此时仅使用英文系统名字即可，如 archlinux、gentoo 。
+当然有时候会存在特殊情况，version可能是current/base，此时系统参数仅使用英文系统名字即可，如 archlinux、gentoo、kali。
 :::
 
-**所有系统的CT默认用户名是root**
-
 ## 单独开设LXC虚拟化的CT
 
 :::warning