Merge pull request #48301 from nextcloud/backport/48268/stable29

[stable29] fix: skip the integrity check for nextcloud-init-sync.lock
nextcloud · Sep 23, 2024 · 2fef861 · 2fef861
2 parents d1a87cd + 27c68fd
commit 2fef861
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php
@@ -42,10 +42,11 @@ class ExcludeFileByNameFilterIterator extends \RecursiveFilterIterator {
 	 */
 	private $excludedFilenames = [
 		'.DS_Store', // Mac OS X
-		'Thumbs.db', // Microsoft Windows
 		'.directory', // Dolphin (KDE)
-		'.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage web-apps.
 		'.rnd',
+		'.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage web-apps.
+		'Thumbs.db', // Microsoft Windows
+		'nextcloud-init-sync.lock' // Used by nextcloud/docker to prevent running the initialization script on multiple containers at the same time: https://github.com/nextcloud/docker/issues/2299.
 	];
 
 	/**