7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-09 06:27:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Use ActionSelect for Docker Host & validate input (#3864)

Browse Source 
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead
This commit is contained in:
Nelson Chan
2023-11-03 21:25:28 +08:00
committed by GitHub
parent fdfb572e09
commit b534fde265
5 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/model/monitor.js
View File

@@ -673,8 +673,6 @@ class Monitor extends BeanModel {
} else if (this.type === "docker") {
log.debug("monitor", `[${this.name}] Prepare Options for Axios`);
const dockerHost = await R.load("docker_host", this.docker_host);
const options = {
url: `/containers/${this.docker_container}/json`,
timeout: this.interval * 1000 * 0.8,
@@ -690,6 +688,12 @@ class Monitor extends BeanModel {
}),
};
const dockerHost = await R.load("docker_host", this.docker_host);
if (!dockerHost) {
throw new Error("Failed to load docker host config");
}
if (dockerHost._dockerType === "socket") {
options.socketPath = dockerHost._dockerDaemon;
} else if (dockerHost._dockerType === "tcp") {