Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-11-02 19:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): label Docker published ports precisely

Browse Source
This commit is contained in:
VAIO73
2026-10-19 08:27:47 +00:00
parent 8775fd30c5
commit e44db4897b
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppImage/components/lxc-app-panel.tsx
+2 -1
View File
@@ -2569,7 +2569,8 @@ export function LxcAppPanel({ vmid, ctIp, onChange, managed, initialData, oci }:
{t(e.kind === "docker_container" ? "vmLxc.appEditor.dockerEvidenceContainer" {t(e.kind === "docker_container" ? "vmLxc.appEditor.dockerEvidenceContainer"
: e.kind === "docker_image" ? "vmLxc.appEditor.dockerEvidenceImage" : e.kind === "docker_image" ? "vmLxc.appEditor.dockerEvidenceImage"
: e.kind === "compose_project" ? "vmLxc.appEditor.dockerEvidenceProject" : e.kind === "compose_project" ? "vmLxc.appEditor.dockerEvidenceProject"
: e.kind === "tcp_listener" ? "vmLxc.appEditor.nativeEvidencePort" : e.kind === "tcp_listener" ? (d.source === "docker_metadata"
? "vmLxc.appEditor.dockerEvidencePort" : "vmLxc.appEditor.nativeEvidencePort")
: e.kind === "installation_file" ? "vmLxc.appEditor.nativeEvidenceFile" : e.kind === "installation_file" ? "vmLxc.appEditor.nativeEvidenceFile"
: e.kind === "process_executable" ? "vmLxc.appEditor.nativeEvidenceProcess" : e.kind === "process_executable" ? "vmLxc.appEditor.nativeEvidenceProcess"
: e.kind === "working_directory" ? "vmLxc.appEditor.nativeEvidenceDirectory" : e.kind === "working_directory" ? "vmLxc.appEditor.nativeEvidenceDirectory"
AppImage/messages/en/common.json
+1
View File
@@ -1755,6 +1755,7 @@
"dockerScanPartial": "Docker search is incomplete. Some containers could not be checked.", "dockerScanPartial": "Docker search is incomplete. Some containers could not be checked.",
"dockerEvidenceContainer": "Docker container", "dockerEvidenceContainer": "Docker container",
"dockerEvidenceImage": "Image", "dockerEvidenceImage": "Image",
"dockerEvidencePort": "Published TCP port",
"dockerEvidenceProject": "Compose project", "dockerEvidenceProject": "Compose project",
"dockerEndpointReview": "Container with published TCP ports. Confirm the name and web address before saving. Registration does not configure updates.", "dockerEndpointReview": "Container with published TCP ports. Confirm the name and web address before saving. Registration does not configure updates.",
"noNewApplicationsDetected": "No new applications were detected.", "noNewApplicationsDetected": "No new applications were detected.",
AppImage/messages/sk/common.json
+1
View File
@@ -1699,6 +1699,7 @@
"dockerScanPartial": "Docker vyhľadávanie je neúplné. Niektoré kontajnery sa nepodarilo skontrolovať.", "dockerScanPartial": "Docker vyhľadávanie je neúplné. Niektoré kontajnery sa nepodarilo skontrolovať.",
"dockerEvidenceContainer": "Docker kontajner", "dockerEvidenceContainer": "Docker kontajner",
"dockerEvidenceImage": "Obraz", "dockerEvidenceImage": "Obraz",
"dockerEvidencePort": "Publikovaný TCP port",
"dockerEvidenceProject": "Compose projekt", "dockerEvidenceProject": "Compose projekt",
"dockerEndpointReview": "Kontajner s publikovanými TCP portmi. Pred uložením potvrď názov a webovú adresu. Registrácia nenastaví aktualizácie.", "dockerEndpointReview": "Kontajner s publikovanými TCP portmi. Pred uložením potvrď názov a webovú adresu. Registrácia nenastaví aktualizácie.",
"noNewApplicationsDetected": "Neboli zistené žiadne nové aplikácie.", "noNewApplicationsDetected": "Neboli zistené žiadne nové aplikácie.",
tests/lxc_updates/test_docker_app_discovery_ui.cjs
+2 -1
View File
@@ -5,7 +5,7 @@ const candidate = {
vmid:101,slug:'docker-'+'b'.repeat(24),discovery_id:'docker-'+'b'.repeat(24), vmid:101,slug:'docker-'+'b'.repeat(24),discovery_id:'docker-'+'b'.repeat(24),
source:'docker_metadata',name:'Uncatalogued web app',default_ports:[8080], source:'docker_metadata',name:'Uncatalogued web app',default_ports:[8080],
installed_version:null,tracking_suggestion:null, installed_version:null,tracking_suggestion:null,
evidence:[{kind:'docker_container',value:'web-1'},{kind:'docker_image',value:'example/web:7'}], evidence:[{kind:'docker_container',value:'web-1'},{kind:'docker_image',value:'example/web:7'},{kind:'tcp_listener',value:'8080'}],
} }
async function main() { async function main() {
const f = fixture({nativeCandidate:null,dockerCandidate:candidate}) const f = fixture({nativeCandidate:null,dockerCandidate:candidate})
@@ -15,6 +15,7 @@ async function main() {
assert.equal(f.calls.filter(c=>c.url.endsWith('/docker-discovery')&&c.method==='POST').length,1) assert.equal(f.calls.filter(c=>c.url.endsWith('/docker-discovery')&&c.method==='POST').length,1)
assert.ok(text(f.tree()).includes('example/web:7')) assert.ok(text(f.tree()).includes('example/web:7'))
assert.ok(text(f.tree()).includes('dockerEndpointReview')) assert.ok(text(f.tree()).includes('dockerEndpointReview'))
assert.ok(text(f.tree()).includes('dockerEvidencePort'),'published mapping is not claimed as a probed listener')
assert.ok(text(f.tree()).includes('nativeVersionUnknown')) assert.ok(text(f.tree()).includes('nativeVersionUnknown'))
await f.button('registerButton').props.onClick(); f.render() await f.button('registerButton').props.onClick(); f.render()
f.button('cancelButton').props.onClick(); f.render() f.button('cancelButton').props.onClick(); f.render()