0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix docker service discovery, code styling

Browse source
This commit is contained in:
shamoon 2023-06-07 14:06:23 -07:00
parent f656c2b46d
commit 4245f1070a
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/utils/config/service-helpers.js
View file

@ -62,13 +62,10 @@ export async function servicesFromDocker() {
const serviceServers = await Promise.all( const serviceServers = await Promise.all(
Object.keys(servers).map(async (serverName) => { Object.keys(servers).map(async (serverName) => {
const isSwarm = servers[serverName].swarm ?? false;
try { try {
const listProperties = { all: true }; const isSwarm = !!servers[serverName].swarm;
const labelProperty = (isSwarm) ? 'Spec.Labels' : 'Labels';
const nameProperty = (isSwarm) ? 'Spec.Name' : 'Name[0]';
const docker = new Docker(getDockerArguments(serverName).conn); const docker = new Docker(getDockerArguments(serverName).conn);
const listProperties = { all: true };
const containers = await ((isSwarm) ? docker.listServices(listProperties) : docker.listContainers(listProperties)); const containers = await ((isSwarm) ? docker.listServices(listProperties) : docker.listContainers(listProperties));
// bad docker connections can result in a <Buffer ...> object? // bad docker connections can result in a <Buffer ...> object?
@ -79,18 +76,19 @@ export async function servicesFromDocker() {
const discovered = containers.map((container) => { const discovered = containers.map((container) => {
let constructedService = null; let constructedService = null;
const labels = shvl.get(container, labelProperty); const containerLabels = isSwarm ? shvl.get(container, 'Spec.Labels') : container.Labels;
const containerName = isSwarm ? shvl.get(container, 'Spec.Name') : container.Names[0];
Object.keys(labels).forEach((label) => { Object.keys(containerLabels).forEach((label) => {
if (label.startsWith("homepage.")) { if (label.startsWith("homepage.")) {
if (!constructedService) { if (!constructedService) {
constructedService = { constructedService = {
container: shvl.get(container, nameProperty).replace(/^\//, ""), container: containerName.replace(/^\//, ""),
server: serverName, server: serverName,
type: 'service' type: 'service'
}; };
} }
shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(labels[label])); shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(containerLabels[label]));
} }
}); });