From 688b5b198edf9dfb0f4c33241796784b71546a27 Mon Sep 17 00:00:00 2001
From: Mira Kristipati <5008962+libkothimira@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:36:51 -0500
Subject: [PATCH] update instance handling

---
 src/utils/config/service-helpers.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 3b33df19..24836a0d 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -37,11 +37,11 @@ export async function servicesFromDocker() {
   const dockerYaml = path.join(process.cwd(), "config", "docker.yaml");
   const dockerFileContents = await fs.readFile(dockerYaml, "utf8");
   const servers = yaml.load(dockerFileContents);
-
+  
   if (!servers) {
     return [];
   }
-
+  const instance = servers.instance || process.env.INSTANCE;
   const serviceServers = await Promise.all(
     Object.keys(servers).map(async (serverName) => {
       try {
@@ -60,14 +60,14 @@ export async function servicesFromDocker() {
           let constructedService = null;
 
           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) {
                 constructedService = {
                   container: container.Names[0].replace(/^\//, ""),
                   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]);
             }
           });