vrr/pangolin
2
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-04-28 11:49:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge dev into fix/log-analytics-adjustments

Browse source
This commit is contained in:
Fred KISSIE 2025-12-10 03:19:14 +01:00
parent 9db2feff77
commit d490cab48c
555 changed files with 9375 additions and 9287 deletions
Download patch file Download diff file Expand all files Collapse all files

15
server/lib/blueprints/parseDockerContainers.ts
View file

@ -84,12 +84,20 @@ export function processContainerLabels(containers: Container[]): {
// Process proxy resources
if (Object.keys(proxyResourceLabels).length > 0) {
processResourceLabels(proxyResourceLabels, container, result["proxy-resources"]);
processResourceLabels(
proxyResourceLabels,
container,
result["proxy-resources"]
);
}
// Process client resources
if (Object.keys(clientResourceLabels).length > 0) {
processResourceLabels(clientResourceLabels, container, result["client-resources"]);
processResourceLabels(
clientResourceLabels,
container,
result["client-resources"]
);
}
});
@ -161,8 +169,7 @@ function processResourceLabels(
const finalTarget = { ...target };
if (!finalTarget.hostname) {
finalTarget.hostname =
container.name ||
container.hostname;
container.name || container.hostname;
}
if (!finalTarget.port) {
const containerPort =