Changeset 59311

Timestamp:

10/28/2024 06:11:39 PM (5 weeks ago)

Author:

desrosj

Message:

Build/Test Tools: Support Docker compose override files.

This updates the logic introduced in [59279] to account for the presence of docker-compose.override.yml files.

Reviewed by peterwilsoncc.
Merges 59283] to the 6.7 branch.

Props xknown, davidbaumwald.
See #61218.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• tools/local-env/scripts/utils.js (modified) (2 diffs)

branches/6.7/tools/local-env/scripts/utils.js

@@ +1 @@
+const { existsSync } = require( 'node:fs' );
+
 const local_env_utils = {
 
@@ -12 +14 @@
     get_compose_files: function() {
         var composeFiles = '-f docker-compose.yml';
+
+        if ( existsSync( 'docker-compose.override.yml' ) ) {
+            composeFiles = composeFiles + ' -f docker-compose.override.yml';
+        }
 
         if ( process.env.LOCAL_DB_TYPE !== 'mysql' ) {