add automatic compose file location fetching

Author: Crow-Control

CHANGELOG.md

@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Compose label-driven docker-compose trigger configuration** — Added support for container labels to create and scope compose triggers from discovered containers, including `dd.compose.file` / `wud.compose.file` and compose trigger options (`backup`, `prune`, `dryrun`, `auto`, `threshold`).
 - **Compose-file digest update support** — Docker-compose trigger now supports digest-pinned image references in compose files (`image@sha256:...` and `image:tag@sha256:...`) so digest-based services can be updated without dropping pinning.
 
+- **Compose-native auto-compose discovery** — Added `dd.compose.native` / `wud.compose.native` container labels to enable deriving compose file paths from native Compose labels (`com.docker.compose.project.config_files` + `com.docker.compose.project.working_dir`) when `dd.compose.file` is not set.
+- **Watcher-wide compose-native default** — Added `DD_WATCHER_DOCKER_{name}_COMPOSENATIVE=true` to enable compose-native path discovery for all containers watched by a Docker watcher, with per-container `dd.compose.native` still taking precedence.
+
 ### Fixed
 
 - **TrueForge registry default behavior** — Fixed TrueForge registry integration so it works out of the box with default configuration.

README.md

@@ -402,12 +402,15 @@ When using the Docker Compose trigger, container labels can override trigger set
 | `dd.compose.prune` | `wud.compose.prune` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_PRUNE` | `true` / `false` |
 | `dd.compose.dryrun` | `wud.compose.dryrun` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_DRYRUN` | `true` / `false` |
 | `dd.compose.auto` | `wud.compose.auto` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_AUTO` | `true` / `false` |
+| `dd.compose.native` | `wud.compose.native` | `DD_WATCHER_DOCKER_xxx_COMPOSENATIVE` | `true` / `false` |
 | `dd.compose.threshold` | `wud.compose.threshold` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_THRESHOLD` | `all` / `major` / `minor` / `patch` |
 
 Behavior notes:
 
 - `dd.compose.file` / `wud.compose.file` causes drydock to create (or reuse) a scoped `dockercompose` trigger for that container.
 - That generated compose trigger is set with `requireinclude=true` and auto-appended to the container include list, so it only runs for explicitly associated containers.
+- `dd.compose.native` / `wud.compose.native` enables deriving compose file paths from native Compose labels (`com.docker.compose.project.config_files` and `com.docker.compose.project.working_dir`).
+- `DD_WATCHER_DOCKER_xxx_COMPOSENATIVE=true` enables compose-native lookup by default for all containers in that watcher (container label can still override).
 - If `dd.compose.auto` is omitted, normal trigger default applies (`auto=true`).
 
 `dd.*` labels take precedence when both `dd.*` and `wud.*` are present.

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

@@ -10,6 +10,7 @@ import Docker, {
   testable_filterBySegmentCount,
   testable_getContainerDisplayName,
   testable_getContainerName,
+  testable_getComposeFilePathFromLabels,
   testable_getCurrentPrefix,
   testable_getFirstDigitIndex,
   testable_getImageForRegistryLookup,
@@ -2863,6 +2864,76 @@ describe('Docker Watcher', () => {
       expect(result.triggerInclude).toBe('dockercompose.tmp-test-container-wud');
     });
 
+    test('should auto-include dockercompose trigger from compose-native labels when dd.compose.native is true', async () => {
+      const container = await setupContainerDetailTest(docker, {
+        container: {
+          Image: 'nginx:1.0.0',
+          Names: ['/test-container-native'],
+          Labels: {
+            'dd.compose.native': 'true',
+            'com.docker.compose.project.working_dir': '/opt/my-stack',
+            'com.docker.compose.project.config_files': 'docker-compose.yml',
+          },
+        },
+      });
+
+      const result = await docker.addImageDetailsToContainer(container);
+
+      expect(registry.ensureDockercomposeTriggerForContainer).toHaveBeenCalledWith(
+        'test-container-native',
+        '/opt/my-stack/docker-compose.yml',
+        {},
+      );
+      expect(result.triggerInclude).toBe('dockercompose.my-stack-test-container-native');
+    });
+
+    test('should auto-include dockercompose trigger from compose-native labels when watcher composenative is enabled', async () => {
+      const container = await setupContainerDetailTest(docker, {
+        registerConfig: {
+          composenative: true,
+        },
+        container: {
+          Image: 'nginx:1.0.0',
+          Names: ['/test-container-native-global'],
+          Labels: {
+            'com.docker.compose.project.working_dir': '/opt/global-stack',
+            'com.docker.compose.project.config_files': 'compose.yml',
+          },
+        },
+      });
+
+      const result = await docker.addImageDetailsToContainer(container);
+
+      expect(registry.ensureDockercomposeTriggerForContainer).toHaveBeenCalledWith(
+        'test-container-native-global',
+        '/opt/global-stack/compose.yml',
+        {},
+      );
+      expect(result.triggerInclude).toBe('dockercompose.global-stack-test-container-native-global');
+    });
+
+    test('should not auto-include dockercompose trigger from compose-native labels when dd.compose.native is false', async () => {
+      const container = await setupContainerDetailTest(docker, {
+        registerConfig: {
+          composenative: true,
+        },
+        container: {
+          Image: 'nginx:1.0.0',
+          Names: ['/test-container-native-disabled'],
+          Labels: {
+            'dd.compose.native': 'false',
+            'com.docker.compose.project.working_dir': '/opt/disabled-stack',
+            'com.docker.compose.project.config_files': 'compose.yml',
+          },
+        },
+      });
+
+      const result = await docker.addImageDetailsToContainer(container);
+
+      expect(registry.ensureDockercomposeTriggerForContainer).not.toHaveBeenCalled();
+      expect(result.triggerInclude).toBeUndefined();
+    });
+
     test('should pass compose trigger options from labels', async () => {
       const container = await setupContainerDetailTest(docker, {
         container: {
@@ -4687,6 +4758,42 @@ describe('Docker Watcher', () => {
       expect(testable_getLabel({}, 'dd.display.name')).toBeUndefined();
     });
 
+    test('getComposeFilePathFromLabels should prefer dd.compose.file over compose-native labels', () => {
+      const composeFile = testable_getComposeFilePathFromLabels(
+        {
+          'dd.compose.file': '/opt/explicit/docker-compose.yml',
+          'dd.compose.native': 'true',
+          'com.docker.compose.project.working_dir': '/opt/native',
+          'com.docker.compose.project.config_files': 'compose.yml',
+        },
+        false,
+      );
+      expect(composeFile).toBe('/opt/explicit/docker-compose.yml');
+    });
+
+    test('getComposeFilePathFromLabels should resolve compose-native labels when enabled globally', () => {
+      const composeFile = testable_getComposeFilePathFromLabels(
+        {
+          'com.docker.compose.project.working_dir': '/opt/native',
+          'com.docker.compose.project.config_files': 'compose.yml',
+        },
+        true,
+      );
+      expect(composeFile).toBe('/opt/native/compose.yml');
+    });
+
+    test('getComposeFilePathFromLabels should return undefined when compose-native labels are disabled', () => {
+      const composeFile = testable_getComposeFilePathFromLabels(
+        {
+          'dd.compose.native': 'false',
+          'com.docker.compose.project.working_dir': '/opt/native',
+          'com.docker.compose.project.config_files': 'compose.yml',
+        },
+        true,
+      );
+      expect(composeFile).toBeUndefined();
+    });
+
     test('appendTriggerId should return triggerInclude when triggerId is undefined', () => {
       expect(testable_appendTriggerId('ntfy.default:major', undefined)).toBe('ntfy.default:major');
     });

app/watchers/providers/docker/Docker.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import path from 'node:path';
 import axios from 'axios';
 import Dockerode from 'dockerode';
 import Joi from 'joi';
@@ -38,6 +39,7 @@ import {
   ddComposeBackup,
   ddComposeDryrun,
   ddComposeFile,
+  ddComposeNative,
   ddComposePrune,
   ddComposeThreshold,
   ddDisplayIcon,
@@ -59,6 +61,7 @@ import {
   wudDisplayIcon,
   wudDisplayName,
   wudComposeFile,
+  wudComposeNative,
   wudComposePrune,
   wudComposeThreshold,
   wudInspectTagPath,
@@ -97,6 +100,7 @@ export interface DockerWatcherConfiguration extends ComponentConfiguration {
   watchdigest?: any;
   watchevents: boolean;
   watchatstart: boolean;
+  composenative: boolean;
   maintenancewindow?: string;
   maintenancewindowtz: string;
   imgset?: Record<string, any>;
@@ -135,6 +139,8 @@ const START_WATCHER_DELAY_MS = 1000;
 const DEBOUNCED_WATCH_CRON_MS = 5000;
 const MAINTENANCE_WINDOW_QUEUE_POLL_MS = 60 * 1000;
 const SWARM_SERVICE_ID_LABEL = 'com.docker.swarm.service.id';
+const COMPOSE_PROJECT_CONFIG_FILES_LABEL = 'com.docker.compose.project.config_files';
+const COMPOSE_PROJECT_WORKING_DIR_LABEL = 'com.docker.compose.project.working_dir';
 const OIDC_ACCESS_TOKEN_REFRESH_WINDOW_MS = 30 * 1000;
 const OIDC_DEFAULT_ACCESS_TOKEN_TTL_MS = 5 * 60 * 1000;
 const OIDC_DEFAULT_TIMEOUT_MS = 5000;
@@ -224,6 +230,58 @@ function getDockercomposeTriggerConfigurationFromLabels(labels: Record<string, s
   return dockercomposeConfig;
 }
 
+function isAutoComposeEnabled(
+  labels: Record<string, string>,
+  composeNativeEnabledByWatcher: boolean,
+): boolean {
+  const autoComposeLabelValue = getLabel(labels, ddComposeNative, wudComposeNative);
+  if (autoComposeLabelValue !== undefined && autoComposeLabelValue.trim() !== '') {
+    return autoComposeLabelValue.toLowerCase() === 'true';
+  }
+  return composeNativeEnabledByWatcher;
+}
+
+function getComposeNativeFilePathFromLabels(labels: Record<string, string>) {
+  const composeConfigFiles = labels[COMPOSE_PROJECT_CONFIG_FILES_LABEL];
+  if (!composeConfigFiles || composeConfigFiles.trim() === '') {
+    return undefined;
+  }
+
+  const composeProjectWorkingDir = labels[COMPOSE_PROJECT_WORKING_DIR_LABEL];
+  const configFiles = composeConfigFiles
+    .split(',')
+    .map((configFile) => configFile.trim())
+    .filter((configFile) => configFile !== '');
+
+  for (const configFile of configFiles) {
+    if (path.isAbsolute(configFile)) {
+      return configFile;
+    }
+    if (composeProjectWorkingDir && composeProjectWorkingDir.trim() !== '') {
+      return path.join(composeProjectWorkingDir, configFile);
+    }
+    return configFile;
+  }
+
+  return undefined;
+}
+
+function getComposeFilePathFromLabels(
+  labels: Record<string, string>,
+  composeNativeEnabledByWatcher: boolean,
+) {
+  const composeFilePathFromLabel = getLabel(labels, ddComposeFile, wudComposeFile);
+  if (composeFilePathFromLabel) {
+    return composeFilePathFromLabel;
+  }
+
+  if (!isAutoComposeEnabled(labels, composeNativeEnabledByWatcher)) {
+    return undefined;
+  }
+
+  return getComposeNativeFilePathFromLabels(labels);
+}
+
 interface ResolvedImgset {
   name: string;
   includeTags?: string;
@@ -1066,6 +1124,7 @@ class Docker extends Watcher {
       watchdigest: this.joi.any(),
       watchevents: this.joi.boolean().default(true),
       watchatstart: this.joi.boolean().default(true),
+      composenative: this.joi.boolean().default(false),
       maintenancewindow: joi.string().cron().optional(),
       maintenancewindowtz: this.joi.string().default('UTC'),
       imgset: this.joi
@@ -1266,7 +1325,10 @@ class Docker extends Watcher {
 
     for (const containerInStore of containersInStore) {
       const containerLabels = containerInStore.labels || {};
-      const composeFilePath = getLabel(containerLabels, ddComposeFile, wudComposeFile);
+      const composeFilePath = getComposeFilePathFromLabels(
+        containerLabels,
+        this.configuration.composenative,
+      );
       if (!composeFilePath) {
         continue;
       }
@@ -2045,7 +2107,10 @@ class Docker extends Watcher {
     }
 
     const containerId = containerFound.id;
-    const composeFilePath = getLabel(labelsToApply, ddComposeFile, wudComposeFile);
+    const composeFilePath = getComposeFilePathFromLabels(
+      labelsToApply,
+      this.configuration.composenative,
+    );
     if (composeFilePath) {
       let dockercomposeTriggerId = this.composeTriggersByContainer[containerId];
       if (!dockercomposeTriggerId) {
@@ -2514,7 +2579,10 @@ class Docker extends Watcher {
   async addImageDetailsToContainer(container: any, labelOverrides: ContainerLabelOverrides = {}) {
     const containerId = container.Id;
     const containerLabels = container.Labels || {};
-    const composeFilePath = containerLabels[ddComposeFile] || containerLabels[wudComposeFile];
+    const composeFilePath = getComposeFilePathFromLabels(
+      containerLabels,
+      this.configuration.composenative,
+    );
     const needsComposeTriggerCreation =
       !!composeFilePath && !this.composeTriggersByContainer[containerId];
 
@@ -2736,4 +2804,5 @@ export {
   getImageReferenceCandidatesFromPattern as testable_getImageReferenceCandidatesFromPattern,
   getImgsetSpecificity as testable_getImgsetSpecificity,
   getInspectValueByPath as testable_getInspectValueByPath,
+  getComposeFilePathFromLabels as testable_getComposeFilePathFromLabels,
 };

app/watchers/providers/docker/label.ts

@@ -105,6 +105,13 @@ export const wudComposeDryrun = 'wud.compose.dryrun';
 export const ddComposeAuto = 'dd.compose.auto';
 export const wudComposeAuto = 'wud.compose.auto';
 
+/**
+ * Optional auto-compose discovery mode (true | false).
+ * When enabled, use compose-native labels to derive compose file path.
+ */
+export const ddComposeNative = 'dd.compose.native';
+export const wudComposeNative = 'wud.compose.native';
+
 /**
  * Optional dockercompose trigger threshold setting.
  */