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

Followup #3864, rebase for 1.23.x (#4016)

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

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
This commit is contained in:
Louis Lam
2023-11-12 20:32:40 +08:00
committed by GitHub
parent 6e80c850f4
commit 8e3ff25f7b
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

@@ -739,8 +739,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,
@@ -757,6 +755,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") {