mirror of
https://github.com/oneclickvirt/ecs.git
synced 2025-10-04 06:56:29 +08:00
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8e6037c340 | ||
![]() |
be59af4411 | ||
![]() |
7ae753a4e2 | ||
![]() |
3956420ffe | ||
![]() |
6ebe25af2d | ||
![]() |
fe02bd295a | ||
![]() |
172b520702 | ||
![]() |
d460e2b167 |
@@ -2,7 +2,8 @@
|
||||
FROM alpine:latest
|
||||
# 安装必要的工具
|
||||
RUN apk add --no-cache wget curl bash
|
||||
RUN apk add --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
|
||||
RUN apk add --no-cache bind-tools
|
||||
# --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
|
||||
RUN apk add --no-cache grep openssl ca-certificates uuidgen
|
||||
RUN export noninteractive=true
|
||||
# 下载并执行 goecs.sh 脚本
|
||||
@@ -11,4 +12,4 @@ RUN curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -
|
||||
bash goecs.sh env && \
|
||||
bash goecs.sh install
|
||||
# 设置 goecs 为入口点
|
||||
ENTRYPOINT ["goecs"]
|
||||
ENTRYPOINT ["goecs"]
|
||||
|
23
README.md
23
README.md
@@ -24,15 +24,16 @@ Shell 版本:[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
|
||||
|
||||
### **编译与测试支持情况**
|
||||
| 编译支持的架构 | 测试支持的架构 | 编译支持的系统 | 测试支持的系统 |
|
||||
|-------------|------|--------|------------|
|
||||
| amd64 | amd64 | Linux | Linux |
|
||||
| arm | arm | Windows | Windows |
|
||||
| arm64 | arm64 | FreeBSD | FreeBSD |
|
||||
| 386 | 386 | OpenBSD | OpenBSD |
|
||||
| mips | | MacOS | |
|
||||
| mipsle | | | |
|
||||
| s390x | s390x | | |
|
||||
| riscv64 | | | |
|
||||
|---------------------------|-----------|------------------------------|-----------|
|
||||
| amd64 | amd64 | Linux | Linux |
|
||||
| arm | arm | Windows | Windows |
|
||||
| arm64 | arm64 | FreeBSD | FreeBSD |
|
||||
| 386 | 386 | | |
|
||||
| mips | | MacOS | |
|
||||
| mipsle | | | |
|
||||
| s390x | s390x | | |
|
||||
| riscv64 | | | |
|
||||
|
||||
|
||||
> 更多架构与系统请自行测试,如有问题请开 issues。
|
||||
|
||||
@@ -68,7 +69,7 @@ Shell 版本:[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
|
||||
|
||||
#### **一键命令**
|
||||
|
||||
将默认安装依赖,默认更新包管理器,默认非互动模式,下面的非一键命令版本可控制是否安装依赖/是否更新包管理器/默认互动模式
|
||||
**一键命令**将**默认安装依赖**,**默认更新包管理器**,**默认非互动模式**
|
||||
|
||||
- **国际用户无加速:**
|
||||
|
||||
@@ -90,6 +91,8 @@ Shell 版本:[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
|
||||
|
||||
#### **详细说明**
|
||||
|
||||
**详细说明**中的命令**可控制是否安装依赖**,**是否更新包管理器**,**默认互动模式可进行选择**
|
||||
|
||||
<details>
|
||||
<summary>展开查看详细说明</summary>
|
||||
|
||||
|
@@ -28,7 +28,7 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:
|
||||
| amd64 | amd64 | Linux | Linux |
|
||||
| arm | arm | Windows | Windows |
|
||||
| arm64 | arm64 | FreeBSD | FreeBSD |
|
||||
| 386 | 386 | OpenBSD | OpenBSD |
|
||||
| 386 | 386 | | |
|
||||
| mips | | MacOS | |
|
||||
| mipsle | | | |
|
||||
| s390x | s390x | | |
|
||||
@@ -68,7 +68,7 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:
|
||||
|
||||
#### **One-click command**
|
||||
|
||||
Will install dependencies by default, update package manager by default, non-interactive mode by default. The non-one-click version below allows control of dependency installation/package manager updates/interactive mode by default.
|
||||
**One-Click Command** will **Install Dependencies by Default**, **Update Package Manager by Default**, **Default Non-Interactive Mode***
|
||||
|
||||
- **International users without acceleration:**
|
||||
|
||||
@@ -90,6 +90,8 @@ Will install dependencies by default, update package manager by default, non-int
|
||||
|
||||
#### **Detailed instructions**
|
||||
|
||||
**Detailed description** of the commands in **Command **Controls whether to install dependencies**, **Whether to update the package manager**, **Default interaction mode can be selected***
|
||||
|
||||
<details>
|
||||
<summary>Expand to view detailed instructions</summary>
|
||||
|
||||
|
@@ -87,6 +87,8 @@ IPV4/IPV6 Location: 显示对应协议的IP在数据库中的地理位置。
|
||||
|
||||
IPV4 Active IPs: 根据 bgp.tools 信息查询当前CIDR分块中 活跃邻居数量/总邻居数量
|
||||
|
||||
IPV6 子网掩码:根据宿主机信息查询的本机IPV6子网大小
|
||||
|
||||
### **CPU测试**
|
||||
|
||||
支持通过命令行参数选择```GeekBench```和```Sysbench```进行测试:
|
||||
|
12
go.mod
12
go.mod
@@ -7,16 +7,16 @@ require (
|
||||
github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841
|
||||
github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926
|
||||
github.com/oneclickvirt/backtrace v0.0.4-20250329130043
|
||||
github.com/oneclickvirt/basics v0.0.11-20250331134007
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250329130006
|
||||
github.com/oneclickvirt/basics v0.0.11-20250404123515
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250404151448
|
||||
github.com/oneclickvirt/defaultset v0.0.2-20240624082446
|
||||
github.com/oneclickvirt/disktest v0.0.5-20250330105204
|
||||
github.com/oneclickvirt/disktest v0.0.7-20250404150324
|
||||
github.com/oneclickvirt/gostun v0.0.3-20250329105202
|
||||
github.com/oneclickvirt/memorytest v0.0.4-20250329125725
|
||||
github.com/oneclickvirt/memorytest v0.0.5-20250404130028
|
||||
github.com/oneclickvirt/nt3 v0.0.4-20250329125813
|
||||
github.com/oneclickvirt/pingtest v0.0.6-20250329130728
|
||||
github.com/oneclickvirt/portchecker v0.0.3-20250329125750
|
||||
github.com/oneclickvirt/security v0.0.4-20250331135215
|
||||
github.com/oneclickvirt/security v0.0.4-20250401123241
|
||||
github.com/oneclickvirt/speedtest v0.0.9-20250329130205
|
||||
)
|
||||
|
||||
@@ -61,6 +61,8 @@ require (
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/nxtrace/NTrace-core v1.3.7 // indirect
|
||||
github.com/oneclickvirt/dd v0.0.1-20250404124549 // indirect
|
||||
github.com/oneclickvirt/fio v0.0.1-20250404141714 // indirect
|
||||
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
|
||||
github.com/oschwald/maxminddb-golang v1.13.1 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
||||
|
24
go.sum
24
go.sum
@@ -107,26 +107,30 @@ github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926 h1:H5//xwVjDR02bQ1hLa
|
||||
github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc=
|
||||
github.com/oneclickvirt/backtrace v0.0.4-20250329130043 h1:d3ubN7FTY2xDKN8mmLc1RbvccpTkvfMADtMBvFCRdt0=
|
||||
github.com/oneclickvirt/backtrace v0.0.4-20250329130043/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
|
||||
github.com/oneclickvirt/basics v0.0.11-20250331134007 h1:yuZ3B2icO/SU7Ns2QHPPeh7K3mJst3JgYOqlOEmFmRQ=
|
||||
github.com/oneclickvirt/basics v0.0.11-20250331134007/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250329130006 h1:IHt1btk79JfWCohc63TTwhI0vgbx4c2FrfTGT5zBtYg=
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250329130006/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
|
||||
github.com/oneclickvirt/basics v0.0.11-20250404123515 h1:2kisK9tBG/Km/HLQFA82lm/B+AWFJp3drjrtGvz8lhw=
|
||||
github.com/oneclickvirt/basics v0.0.11-20250404123515/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250404151448 h1:ovGtCwFXG0qmpyNDRqcNDIiAmhrtemCjIUXTJ1fPH0o=
|
||||
github.com/oneclickvirt/cputest v0.0.10-20250404151448/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
|
||||
github.com/oneclickvirt/dd v0.0.1-20250404124549 h1:QT2QJaMoZabUijqN2a/vzC13ILeKwQR3vatFZxKszW0=
|
||||
github.com/oneclickvirt/dd v0.0.1-20250404124549/go.mod h1:tImu9sPTkLWo2tf1dEN1xQzrylWKauj9hbU8PHfyAeU=
|
||||
github.com/oneclickvirt/defaultset v0.0.2-20240624082446 h1:5Pg3mK/u/vQvSz7anu0nxzrNdELi/AcDAU1mMsmPzyc=
|
||||
github.com/oneclickvirt/defaultset v0.0.2-20240624082446/go.mod h1:e9Jt4tf2sbemCtc84/XgKcHy9EZ2jkc5x2sW1NiJS+E=
|
||||
github.com/oneclickvirt/disktest v0.0.5-20250330105204 h1:FBCqQ1oSaOi8K1Xr3T2S1y6OZtdkUxB1NAGmV+lpMFk=
|
||||
github.com/oneclickvirt/disktest v0.0.5-20250330105204/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
|
||||
github.com/oneclickvirt/disktest v0.0.7-20250404150324 h1:uNTjFzzPBTJruPa25/4VLleHDyCj7QHre6qsVJZLo20=
|
||||
github.com/oneclickvirt/disktest v0.0.7-20250404150324/go.mod h1:LXhRiAYYW0poUMqvUHzgqNqhVnJPj4cxjSA8zTKszbI=
|
||||
github.com/oneclickvirt/fio v0.0.1-20250404141714 h1:rnNQ46O6kE+mFKmPDiWohNMbLr8xR6hzTgAsZcah4QE=
|
||||
github.com/oneclickvirt/fio v0.0.1-20250404141714/go.mod h1:NIq+XYTey68KNERGIy/oRDlzpwLzBVoHOCiqX8didsE=
|
||||
github.com/oneclickvirt/gostun v0.0.3-20250329105202 h1:aJ6E91Lp94lq8iWRcCaxpXTjqOOaWvufr5oras6cFtM=
|
||||
github.com/oneclickvirt/gostun v0.0.3-20250329105202/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
|
||||
github.com/oneclickvirt/memorytest v0.0.4-20250329125725 h1:RTfaO7Ubc8eJz4DUtkO4/v2w/Qr/KITQZatgTr+CqIk=
|
||||
github.com/oneclickvirt/memorytest v0.0.4-20250329125725/go.mod h1:+YNzy+NeVg61d0kNwSyVDqHyVtKzjuRe1NvMzsDLg0I=
|
||||
github.com/oneclickvirt/memorytest v0.0.5-20250404130028 h1:2XLr8Ow922OnxHqFbGtyGFYNJtgTAcwXIr6AwvEp6UQ=
|
||||
github.com/oneclickvirt/memorytest v0.0.5-20250404130028/go.mod h1:qp5uRoSv5lcpUtUqQuFCer4xaZKz9S8UxL+pZopn540=
|
||||
github.com/oneclickvirt/nt3 v0.0.4-20250329125813 h1:ZK5DAz8GUa6oyRE/cWmUKkE02tfgDah4TXvN181em7c=
|
||||
github.com/oneclickvirt/nt3 v0.0.4-20250329125813/go.mod h1:lDpHmjWwLZd6pO8cZCwzrc5rwd8dK+TIYk+DGmRpSGg=
|
||||
github.com/oneclickvirt/pingtest v0.0.6-20250329130728 h1:XYMfpIj32Wuej5G7f7/NB5/i3I9DMX/mF3ZS8N5KKp8=
|
||||
github.com/oneclickvirt/pingtest v0.0.6-20250329130728/go.mod h1:d3Ntx5m9lMll3a/k3+2B+5emj//vgDh4/NHTxs2qQE8=
|
||||
github.com/oneclickvirt/portchecker v0.0.3-20250329125750 h1:TTNL0pnQlRsn046kW59I/9UWRpihttFHWnU7Ixycggk=
|
||||
github.com/oneclickvirt/portchecker v0.0.3-20250329125750/go.mod h1:HQxSTrqM8/QFqHMTBZ7S8H9eEO5FkUXU1eb7ZX5Mk+k=
|
||||
github.com/oneclickvirt/security v0.0.4-20250331135215 h1:dxOgFIGid9lOGSGj8FqLHY8W3Ij1LNQol8AyZFOx07A=
|
||||
github.com/oneclickvirt/security v0.0.4-20250331135215/go.mod h1:ZxM2jTb5E3m2Wfsp8kOmJmO+e1pUcvkBEt9ubCqpJlg=
|
||||
github.com/oneclickvirt/security v0.0.4-20250401123241 h1:myeAQ1wOKIHx5r9qs9dCwx/5FepY+hZu/fDNquMwKaw=
|
||||
github.com/oneclickvirt/security v0.0.4-20250401123241/go.mod h1:Cyo3hwh1irn6yWnTh+YVKtkkVzHlwZgm7t7qR3IPRQA=
|
||||
github.com/oneclickvirt/speedtest v0.0.9-20250329130205 h1:XWM6FhObi+2bEkntPcAAKkiS9w7r6j79DOtmlbq4hhs=
|
||||
github.com/oneclickvirt/speedtest v0.0.9-20250329130205/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
|
||||
github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM=
|
||||
|
2
goecs.go
2
goecs.go
@@ -39,7 +39,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
ecsVersion = "v0.1.24"
|
||||
ecsVersion = "v0.1.27"
|
||||
menuMode bool
|
||||
onlyChinaTest bool
|
||||
input, choice string
|
||||
|
18
goecs.sh
18
goecs.sh
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# From https://github.com/oneclickvirt/ecs
|
||||
# 2024.12.08
|
||||
# 2025.04.02
|
||||
|
||||
# curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
|
||||
# 或
|
||||
@@ -139,8 +139,8 @@ goecs_check() {
|
||||
sleep 1
|
||||
done
|
||||
if [ -z "$ECS_VERSION" ]; then
|
||||
_yellow "Unable to get version info, using default version 0.1.24"
|
||||
ECS_VERSION="0.1.24"
|
||||
_yellow "Unable to get version info, using default version 0.1.27"
|
||||
ECS_VERSION="0.1.27"
|
||||
fi
|
||||
# Check if original goecs command exists
|
||||
version_output=""
|
||||
@@ -573,8 +573,8 @@ env_check() {
|
||||
fi
|
||||
# MacOS support
|
||||
if [ "$(uname -s)" = "Darwin" ]; then
|
||||
echo "Detected MacOS, installing sysbench iproute2mac fio..."
|
||||
brew install --force sysbench iproute2mac fio
|
||||
echo "Detected MacOS, installing sysbench iproute2mac..."
|
||||
brew install --force sysbench iproute2mac
|
||||
else
|
||||
if ! grep -q "^net.ipv4.ping_group_range = 0 2147483647$" /etc/sysctl.conf; then
|
||||
echo "net.ipv4.ping_group_range = 0 2147483647" >> /etc/sysctl.conf
|
||||
@@ -607,11 +607,9 @@ show_help() {
|
||||
3. 关键服务失败
|
||||
推荐:
|
||||
环境依赖安装过程中挂起执行
|
||||
|
||||
必需组件:
|
||||
sysbench/geekbench (CPU性能测试必需)
|
||||
|
||||
可选组件:
|
||||
sysbench/geekbench (CPU性能测试)
|
||||
sudo, tar, unzip, dd, fio
|
||||
speedtest (网络测试)
|
||||
ping (网络连通性测试)
|
||||
@@ -637,10 +635,8 @@ Available commands:
|
||||
Recommended:
|
||||
Hanging execution during environment dependency installation
|
||||
|
||||
Required components:
|
||||
sysbench/geekbench (Required for CPU testing)
|
||||
|
||||
Optional components:
|
||||
sysbench/geekbench (CPU testing)
|
||||
sudo, tar, unzip, dd, fio
|
||||
speedtest (Network testing)
|
||||
ping (Network connectivity)
|
||||
|
@@ -6,7 +6,6 @@ import (
|
||||
"fmt"
|
||||
"github.com/imroc/req/v3"
|
||||
"github.com/oneclickvirt/UnlockTests/uts"
|
||||
"github.com/oneclickvirt/basics/ipv6"
|
||||
"github.com/oneclickvirt/basics/system"
|
||||
. "github.com/oneclickvirt/defaultset"
|
||||
"github.com/oneclickvirt/security/network"
|
||||
@@ -114,12 +113,7 @@ func BasicsAndSecurityCheck(language, nt3CheckType string, securtyCheckStatus bo
|
||||
systemInfo = system.CheckSystemInfo(language)
|
||||
}()
|
||||
wgt.Wait()
|
||||
ipv6Info, errv6 := ipv6.GetIPv6Mask(language)
|
||||
basicInfo := systemInfo + ipInfo
|
||||
if errv6 == nil && ipv6Info != "" {
|
||||
basicInfo += ipv6Info
|
||||
basicInfo += "\n"
|
||||
}
|
||||
if strings.Contains(ipInfo, "IPV4") && strings.Contains(ipInfo, "IPV6") {
|
||||
uts.IPV4 = true
|
||||
uts.IPV6 = true
|
||||
|
Reference in New Issue
Block a user