Merge pull request #27 from City-of-Helsinki/UHF-9842

Renamed docker-compose.yml to compose.yaml because druidfi/tools defaults to compose.yaml now
City-of-Helsinki · Mar 20, 2024 · 08fe754 · 08fe754
2 parents 75458dd + 8ab516d
commit 08fe754
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Drush/Commands/UpdateDrushCommands.php b/src/Drush/Commands/UpdateDrushCommands.php
@@ -258,7 +258,7 @@ private function updateDefaultFiles(UpdateOptions $options) : self {
         'docker/openshift/crons/pubsub.sh',
         'docker/openshift/preflight/preflight.php',
         'docker/openshift/notify.php',
-        'docker-compose.yml',
+        'compose.yaml',
         'phpunit.xml.dist',
         'phpunit.platform.xml',
         'tools/make/project/install.mk',

diff --git a/src/Update/migrations.php b/src/Update/migrations.php
@@ -136,3 +136,13 @@ function drupal_tools_update_5() : UpdateResult {
 
   return new UpdateResult(['Set composer extra.patchLevel configuration.']);
 }
+
+/**
+ * Remove leftover docker-compose.yml file.
+ */
+function drupal_tools_update_6(UpdateOptions $options, FileManager $fileManager) : UpdateResult {
+  $fileManager->removeFiles($options, [
+    'docker-compose.yml',
+  ]);
+  return new UpdateResult(['Attempted to remove docker-compose.yml file.']);
+}