fix copose labels peristent container state

Author: Crow-Control

app/watchers/providers/docker/Docker.test.ts

@@ -592,6 +592,47 @@ describe('Docker Watcher', () => {
       expect(docker.configuration.watchatstart).toBe(false);
     });
 
+    test('should ensure compose trigger from persisted container state during init', async () => {
+      storeContainer.getContainers.mockReturnValue([
+        {
+          id: 'existing-compose',
+          name: 'web',
+          watcher: 'test',
+          labels: {
+            'dd.compose.file': '/tmp/my-stack/docker-compose.yml',
+            'dd.compose.auto': 'true',
+            'dd.compose.prune': 'false',
+          },
+          triggerInclude: 'ntfy.default:major',
+        },
+      ]);
+
+      await docker.register('watcher', 'docker', 'test', {
+        watchatstart: true,
+      });
+
+      await docker.init();
+
+      expect(docker.configuration.watchatstart).toBe(false);
+      expect(registry.ensureDockercomposeTriggerForContainer).toHaveBeenCalledWith(
+        'web',
+        '/tmp/my-stack/docker-compose.yml',
+        {
+          auto: 'true',
+          prune: 'false',
+        },
+      );
+      expect(docker.composeTriggersByContainer['existing-compose']).toBe(
+        'dockercompose.my-stack-web',
+      );
+      expect(storeContainer.updateContainer).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: 'existing-compose',
+          triggerInclude: 'ntfy.default:major,dockercompose.my-stack-web',
+        }),
+      );
+    });
+
     test('should keep watchatstart disabled when explicitly set to false', async () => {
       storeContainer.getContainers.mockReturnValue([]);
       await docker.register('watcher', 'docker', 'test', {

app/watchers/providers/docker/Docker.ts

@@ -1242,6 +1242,8 @@ class Docker extends Watcher {
       }).length === 0;
     this.configuration.watchatstart = this.configuration.watchatstart && isWatcherStoreEmpty;
 
+    await this.ensureComposeTriggersFromStore();
+
     // watch at startup if enabled (after all components have been registered)
     if (this.configuration.watchatstart) {
       this.watchCronTimeout = setTimeout(this.watchFromCron.bind(this), START_WATCHER_DELAY_MS);
@@ -1257,6 +1259,49 @@ class Docker extends Watcher {
     }
   }
 
+  async ensureComposeTriggersFromStore() {
+    const containersInStore = storeContainer.getContainers({
+      watcher: this.name,
+    });
+
+    for (const containerInStore of containersInStore) {
+      const containerLabels = containerInStore.labels || {};
+      const composeFilePath = getLabel(containerLabels, ddComposeFile, wudComposeFile);
+      if (!composeFilePath) {
+        continue;
+      }
+
+      let dockercomposeTriggerId = this.composeTriggersByContainer[containerInStore.id];
+      if (!dockercomposeTriggerId) {
+        try {
+          dockercomposeTriggerId = await registry.ensureDockercomposeTriggerForContainer(
+            containerInStore.name,
+            composeFilePath,
+            getDockercomposeTriggerConfigurationFromLabels(containerLabels),
+          );
+          this.composeTriggersByContainer[containerInStore.id] = dockercomposeTriggerId;
+        } catch (e: any) {
+          this.ensureLogger();
+          this.log.warn(
+            `Unable to create dockercompose trigger for ${containerInStore.name} (${e.message})`,
+          );
+          continue;
+        }
+      }
+
+      const triggerIncludeUpdated = appendTriggerId(
+        containerInStore.triggerInclude,
+        dockercomposeTriggerId,
+      );
+      if (triggerIncludeUpdated !== containerInStore.triggerInclude) {
+        storeContainer.updateContainer({
+          ...containerInStore,
+          triggerInclude: triggerIncludeUpdated,
+        });
+      }
+    }
+  }
+
   initWatcher() {
     const options: Dockerode.DockerOptions = {};
     if (this.configuration.host) {

ui/src/services/registry.ts

@@ -35,8 +35,20 @@ const REGISTRY_PROVIDER_ICONS = {
   docr: 'fab fa-digital-ocean',
 };
 
+function getRegistryProviderName(provider) {
+  return `${provider || ''}`.split('.')[0];
+}
+
+function getRegistryDisplayName(registryName) {
+  const [provider, name] = `${registryName || ''}`.split('.');
+  if (provider === 'custom' && name) {
+    return name;
+  }
+  return provider || '';
+}
+
 function getRegistryProviderIcon(provider) {
-  const providerName = `${provider || ''}`.split('.')[0];
+  const providerName = getRegistryProviderName(provider);
   return REGISTRY_PROVIDER_ICONS[providerName] || 'fas fa-cube';
 }
 
@@ -71,7 +83,7 @@ const REGISTRY_PROVIDER_COLORS = {
 };
 
 function getRegistryProviderColor(provider) {
-  return REGISTRY_PROVIDER_COLORS[provider.split('.')[0]] || '#6B7280';
+  return REGISTRY_PROVIDER_COLORS[getRegistryProviderName(provider)] || '#6B7280';
 }
 
 /**
@@ -83,4 +95,11 @@ async function getAllRegistries() {
   return response.json();
 }
 
-export { getRegistryIcon, getRegistryProviderIcon, getRegistryProviderColor, getAllRegistries };
+export {
+  getRegistryIcon,
+  getRegistryProviderName,
+  getRegistryDisplayName,
+  getRegistryProviderIcon,
+  getRegistryProviderColor,
+  getAllRegistries,
+};