feat: add env for ignore docker socket check #1024

Author: 0xJacky

api/system/router.go

@@ -28,15 +28,16 @@ func InitPrivateRouter(r *gin.RouterGroup) {
 }
 
 func InitSelfCheckRouter(r *gin.RouterGroup) {
-	g := r.Group("self_check")
-	g.GET("", authIfInstalled, SelfCheck)
-	g.POST("/:name/fix", authIfInstalled, SelfCheckFix)
-	g.GET("websocket", authIfInstalled, CheckWebSocket)
+	g := r.Group("self_check", authIfInstalled)
+	g.GET("", middleware.Proxy(), SelfCheck)
+	g.POST("/:name/fix", middleware.Proxy(), SelfCheckFix)
+	g.GET("websocket", middleware.ProxyWs(), CheckWebSocket)
 }
 
 func InitBackupRestoreRouter(r *gin.RouterGroup) {
 	r.POST("system/backup/restore",
 		authIfInstalled,
+		middleware.Proxy(),
 		middleware.EncryptedForm(),
 		RestoreBackup)
 }

app/src/language/ar/app.po

@@ -1,85 +1,85 @@
-#: src/language/generate.ts:24
+#: src/language/generate.ts:40
 msgid "[Nginx UI] ACME User: %{name}, Email: %{email}, CA Dir: %{caDir}"
 msgstr ""
 
-#: src/language/generate.ts:5
+#: src/language/generate.ts:26
 msgid "[Nginx UI] Backing up current certificate for later revocation"
 msgstr ""
 
-#: src/language/generate.ts:7
+#: src/language/generate.ts:43
 msgid "[Nginx UI] Certificate renewed successfully"
 msgstr ""
 
-#: src/language/generate.ts:29
+#: src/language/generate.ts:8
 msgid "[Nginx UI] Certificate successfully revoked"
 msgstr ""
 
-#: src/language/generate.ts:34
+#: src/language/generate.ts:27
 msgid ""
 "[Nginx UI] Certificate was used for server, reloading server TLS certificate"
 msgstr ""
 
-#: src/language/generate.ts:47
+#: src/language/generate.ts:41
 msgid "[Nginx UI] Creating client facilitates communication with the CA server"
 msgstr ""
 
-#: src/language/generate.ts:21
+#: src/language/generate.ts:42
 msgid "[Nginx UI] Environment variables cleaned"
 msgstr ""
 
-#: src/language/generate.ts:10
+#: src/language/generate.ts:5
 msgid "[Nginx UI] Finished"
 msgstr ""
 
-#: src/language/generate.ts:51
+#: src/language/generate.ts:47
 msgid "[Nginx UI] Issued certificate successfully"
 msgstr ""
 
-#: src/language/generate.ts:26
+#: src/language/generate.ts:6
 msgid "[Nginx UI] Obtaining certificate"
 msgstr ""
 
-#: src/language/generate.ts:27
+#: src/language/generate.ts:44
 msgid "[Nginx UI] Preparing for certificate revocation"
 msgstr ""
 
-#: src/language/generate.ts:20
+#: src/language/generate.ts:12
 msgid "[Nginx UI] Preparing lego configurations"
 msgstr ""
 
-#: src/language/generate.ts:33
+#: src/language/generate.ts:4
 msgid "[Nginx UI] Reloading nginx"
 msgstr ""
 
-#: src/language/generate.ts:28
+#: src/language/generate.ts:20
 msgid "[Nginx UI] Revocation completed"
 msgstr ""
 
-#: src/language/generate.ts:22
+#: src/language/generate.ts:7
 msgid "[Nginx UI] Revoking certificate"
 msgstr ""
 
-#: src/language/generate.ts:41
+#: src/language/generate.ts:49
 msgid "[Nginx UI] Revoking old certificate"
 msgstr ""
 
-#: src/language/generate.ts:40
+#: src/language/generate.ts:48
 msgid "[Nginx UI] Setting DNS01 challenge provider"
 msgstr ""
 
-#: src/language/generate.ts:25
+#: src/language/generate.ts:31
 msgid "[Nginx UI] Setting environment variables"
 msgstr ""
 
-#: src/language/generate.ts:15
+#: src/language/generate.ts:13
 msgid "[Nginx UI] Setting HTTP01 challenge provider"
 msgstr ""
 
-#: src/language/generate.ts:6
+#: src/language/generate.ts:32
 msgid "[Nginx UI] Writing certificate private key to disk"
 msgstr ""
 
-#: src/language/generate.ts:42
+#: src/language/generate.ts:50
 msgid "[Nginx UI] Writing certificate to disk"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgstr ""
 msgid "Certificate Expiring Soon"
 msgstr ""
 
-#: src/language/generate.ts:39
+#: src/language/generate.ts:18
 msgid "Certificate not found: %{error}"
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 msgid "Certificate renewed successfully"
 msgstr ""
 
-#: src/language/generate.ts:32
+#: src/language/generate.ts:39
 msgid "Certificate revoked successfully"
 msgstr ""
 
@@ -670,11 +670,17 @@ msgstr ""
 msgid "Check again"
 msgstr ""
 
-#: src/language/generate.ts:23
+#: src/language/generate.ts:17
 msgid ""
 "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`."
+"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."
 msgstr ""
 
 #: src/components/SelfCheck/tasks/frontend/https-check.ts:14
@@ -683,45 +689,62 @@ msgid ""
 "prevents using Passkeys and clipboard features"
 msgstr ""
 
-#: src/language/generate.ts:38
-msgid "Check if the nginx access log path exists"
+#: src/language/generate.ts:45
+msgid ""
+"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"
 msgstr ""
 
-#: src/language/generate.ts:31
+#: src/language/generate.ts:34
 msgid "Check if the nginx configuration directory exists"
 msgstr ""
 
-#: src/language/generate.ts:37
+#: src/language/generate.ts:30
 msgid "Check if the nginx configuration entry file exists"
 msgstr ""
 
-#: src/language/generate.ts:14
-msgid "Check if the nginx error log path exists"
+#: src/language/generate.ts:15
+msgid ""
+"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"
 msgstr ""
 
-#: src/language/generate.ts:12
-msgid "Check if the nginx PID path exists"
+#: src/language/generate.ts:10
+msgid ""
+"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"
 msgstr ""
 
-#: src/language/generate.ts:45
+#: src/language/generate.ts:22
 msgid "Check if the nginx.conf includes the conf.d directory"
 msgstr ""
 
-#: src/language/generate.ts:48
+#: src/language/generate.ts:33
 msgid "Check if the nginx.conf includes the sites-enabled directory"
 msgstr ""
 
-#: src/language/generate.ts:17
+#: src/language/generate.ts:46
 msgid "Check if the nginx.conf includes the streams-enabled directory"
 msgstr ""
 
-#: src/language/generate.ts:43
+#: src/language/generate.ts:21
 msgid ""
 "Check if the sites-available and sites-enabled directories are under the "
 "nginx configuration directory"
 msgstr ""
 
-#: src/language/generate.ts:35
+#: src/language/generate.ts:23
 msgid ""
 "Check if the streams-available and streams-enabled directories are under the "
 "nginx configuration directory"
@@ -1291,7 +1314,7 @@ msgstr ""
 msgid "Docker client not initialized"
 msgstr ""
 
-#: src/language/generate.ts:19
+#: src/language/generate.ts:16
 msgid "Docker socket exists"
 msgstr ""
 
@@ -1691,7 +1714,7 @@ msgstr ""
 msgid "Failed to delete certificate"
 msgstr ""
 
-#: src/language/generate.ts:9
+#: src/language/generate.ts:19
 msgid "Failed to delete certificate from database: %{error}"
 msgstr ""
 
@@ -1835,7 +1858,7 @@ msgstr ""
 msgid "Failed to revoke certificate"
 msgstr ""
 
-#: src/language/generate.ts:46
+#: src/language/generate.ts:24
 msgid "Failed to revoke certificate: %{error}"
 msgstr ""
 
@@ -2337,7 +2360,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: src/language/generate.ts:4
+#: src/language/generate.ts:25
 msgid ""
 "Log file %{log_path} is not a regular file. If you are using nginx-ui in "
 "docker container, please refer to https://nginxui.com/zh_CN/guide/config-"
@@ -2618,7 +2641,7 @@ msgstr ""
 msgid "Nginx Access Log Path"
 msgstr ""
 
-#: src/language/generate.ts:13
+#: src/language/generate.ts:36
 msgid "Nginx access log path exists"
 msgstr ""
 
@@ -2646,11 +2669,11 @@ msgstr ""
 msgid "Nginx config directory is not set"
 msgstr ""
 
-#: src/language/generate.ts:36
+#: src/language/generate.ts:14
 msgid "Nginx configuration directory exists"
 msgstr ""
 
-#: src/language/generate.ts:49
+#: src/language/generate.ts:9
 msgid "Nginx configuration entry file exists"
 msgstr ""
 
@@ -2688,7 +2711,7 @@ msgstr ""
 msgid "Nginx Error Log Path"
 msgstr ""
 
-#: src/language/generate.ts:8
+#: src/language/generate.ts:51
 msgid "Nginx error log path exists"
 msgstr ""
 
@@ -2725,7 +2748,7 @@ msgstr ""
 msgid "Nginx PID Path"
 msgstr ""
 
-#: src/language/generate.ts:50
+#: src/language/generate.ts:35
 msgid "Nginx PID path exists"
 msgstr ""
 
@@ -2785,15 +2808,15 @@ msgid ""
 "few seconds."
 msgstr ""
 
-#: src/language/generate.ts:18
+#: src/language/generate.ts:38
 msgid "Nginx.conf includes conf.d directory"
 msgstr ""
 
-#: src/language/generate.ts:44
+#: src/language/generate.ts:29
 msgid "Nginx.conf includes sites-enabled directory"
 msgstr ""
 
-#: src/language/generate.ts:16
+#: src/language/generate.ts:11
 msgid "Nginx.conf includes streams-enabled directory"
 msgstr ""
 
@@ -3896,7 +3919,7 @@ msgstr ""
 msgid "Site not found"
 msgstr ""
 
-#: src/language/generate.ts:11
+#: src/language/generate.ts:28
 msgid "Sites directory exists"
 msgstr ""
 
@@ -4009,7 +4032,7 @@ msgstr ""
 msgid "Stream not found"
 msgstr ""
 
-#: src/language/generate.ts:30
+#: src/language/generate.ts:37
 msgid "Streams directory exists"
 msgstr ""