OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update instance handling

Browse Source
This commit is contained in:
Mira Kristipati 2023-01-09 15:36:51 -05:00
parent ba928ab9a6
commit 688b5b198e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/config/service-helpers.js
View File

@ -37,11 +37,11 @@ export async function servicesFromDocker() {
const dockerYaml = path.join(process.cwd(), "config", "docker.yaml"); const dockerYaml = path.join(process.cwd(), "config", "docker.yaml");
const dockerFileContents = await fs.readFile(dockerYaml, "utf8"); const dockerFileContents = await fs.readFile(dockerYaml, "utf8");
const servers = yaml.load(dockerFileContents); const servers = yaml.load(dockerFileContents);
if (!servers) { if (!servers) {
return []; return [];
} }
const instance = servers.instance || process.env.INSTANCE;
const serviceServers = await Promise.all( const serviceServers = await Promise.all(
Object.keys(servers).map(async (serverName) => { Object.keys(servers).map(async (serverName) => {
try { try {
@ -60,14 +60,14 @@ export async function servicesFromDocker() {
let constructedService = null; let constructedService = null;
Object.keys(container.Labels).forEach((label) => { Object.keys(container.Labels).forEach((label) => {
if (label.startsWith(`${process.env.INSTANCE}-homepage.`) || label.startsWith('homepage.')) { if (label.startsWith(`homepage.${instance}`) || label.startsWith('homepage.')) {
if (!constructedService) { if (!constructedService) {
constructedService = { constructedService = {
container: container.Names[0].replace(/^\//, ""), container: container.Names[0].replace(/^\//, ""),
server: serverName, server: serverName,
}; };
} }
shvl.set(constructedService, label.replace(RegExp(`(${process.env.INSTANCE}-)?homepage\\.`), ""), container.Labels[label]); shvl.set(constructedService, label.replace(RegExp(`homepage\\.(${instance}\\.)?`), ""), container.Labels[label]);
} }
}); });