mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: add env for ignore docker socket check #1024

Browse source
This commit is contained in:
Jacky 2025-05-09 16:18:00 +08:00
parent 202ac03537
commit 5b0cbf98e1
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
21 changed files with 3155 additions and 2859 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/helper/docker.go
View file

@ -7,7 +7,8 @@ import (
)
func InNginxUIOfficialDocker() bool {
return cast.ToBool(os.Getenv("NGINX_UI_OFFICIAL_DOCKER"))
return cast.ToBool(os.Getenv("NGINX_UI_OFFICIAL_DOCKER")) &&
!cast.ToBool(os.Getenv("NGINX_UI_IGNORE_DOCKER_SOCKET"))
}
func DockerSocketExists() bool {

12
internal/self_check/nginx.go
View file

@ -38,18 +38,6 @@ func CheckPIDPath() error {
return nil
}
// CheckSbinPath checks if the sbin path exists
func CheckSbinPath() error {
path := nginx.GetSbinPath()
if path == "" {
return ErrSbinPathNotExist
}
if !helper.FileExists(path) {
return ErrSbinPathNotExist
}
return nil
}
// CheckAccessLogPath checks if the access log path exists
func CheckAccessLogPath() error {
path := nginx.GetAccessLogPath()

25
internal/self_check/tasks.go
View file

@ -76,19 +76,28 @@ var selfCheckTasks = []*Task{
{
Key: "NginxPID-Path",
Name: translation.C("Nginx PID path exists"),
Description: translation.C("Check if the nginx PID path exists"),
Description: translation.C("Check if the nginx PID path exists. "+
"By default, this path is obtained from 'nginx -V'. If it cannot be obtained, an error will be reported. "+
"In this case, you need to modify the configuration file to specify the Nginx PID path." +
"Refer to the docs for more details: https://nginxui.com/zh_CN/guide/config-nginx.html#pidpath"),
CheckFunc: CheckPIDPath,
},
{
Key: "NginxAccessLog-Path",
Name: translation.C("Nginx access log path exists"),
Description: translation.C("Check if the nginx access log path exists"),
Description: translation.C("Check if the nginx access log path exists. "+
"By default, this path is obtained from 'nginx -V'. If it cannot be obtained or the obtained path does not point to a valid, "+
"existing file, an error will be reported. In this case, you need to modify the configuration file to specify the access log path." +
"Refer to the docs for more details: https://nginxui.com/zh_CN/guide/config-nginx.html#accesslogpath"),
CheckFunc: CheckAccessLogPath,
},
{
Key: "NginxErrorLog-Path",
Name: translation.C("Nginx error log path exists"),
Description: translation.C("Check if the nginx error log path exists"),
Description: translation.C("Check if the nginx error log path exists. "+
"By default, this path is obtained from 'nginx -V'. If it cannot be obtained or the obtained path does not point to a valid, "+
"existing file, an error will be reported. In this case, you need to modify the configuration file to specify the error log path." +
"Refer to the docs for more details: https://nginxui.com/zh_CN/guide/config-nginx.html#errorlogpath"),
CheckFunc: CheckErrorLogPath,
},
}
@ -114,12 +123,18 @@ func init() {
FixFunc: FixNginxConfIncludeStreams,
})
}
if helper.InNginxUIOfficialDocker() {
selfCheckTasks = append(selfCheckTasks, &Task{
Name: translation.C("Docker socket exists"),
Description: translation.C("Check if /var/run/docker.sock exists. If you are using Nginx UI Official " +
Description: translation.C("Check if /var/run/docker.sock exists. "+
"If you are using Nginx UI Official " +
"Docker Image, please make sure the docker socket is mounted like this: `-" +
"v /var/run/docker.sock:/var/run/docker.sock`."),
"v /var/run/docker.sock:/var/run/docker.sock`. "+
"Nginx UI official image uses /var/run/docker.sock to communicate with the host Docker Engine via Docker Client API. "+
"This feature is used to control Nginx in another container and perform container replacement rather than binary replacement "+
"during OTA upgrades of Nginx UI to ensure container dependencies are also upgraded. "+
"If you don't need this feature, please add the environment variable NGINX_UI_IGNORE_DOCKER_SOCKET=true to the container."),
CheckFunc: CheckDockerSocket,
})
}