Env: Detect healthcheck.sh in pinned MariaDB images instead of matchi…

…ng versions
desrosj · Oct 6, 2026 · Sep 29, 2026 · Sep 29, 2026 · Sep 29, 2026 · Sep 29, 2026
commit ef273b341625990d7b8e9291e3550f7eefc7b628
@@ -72,25 +72,21 @@ function getMounts(
 	];
 }
 
-/**
- * MariaDB versions whose images predate `healthcheck.sh` and `mariadb-admin`.
- * A major-only "5" is included because the `mariadb:5` tag is 5.5.
- */
-const LEGACY_MARIADB_VERSIONS = [ '5', '5.5', '10.0', '10.1', '10.2', '10.3' ];
-
 /**
  * Gets the database healthcheck for the given MariaDB version.
  *
- * Images from 10.4 onward ship MariaDB's `healthcheck.sh`:
+ * The default `lts` and `latest` images ship MariaDB's `healthcheck.sh`:
  * --connect verifies a TCP connection and that the entrypoint has finished,
  * and --innodb_initialized ensures InnoDB is fully initialized. The
  * MARIADB_AUTO_UPGRADE env var ensures its healthcheck user exists for
  * existing installations.
  *
- * Older images have neither `healthcheck.sh` nor `mariadb-admin`, so they are
- * pinged with `mysqladmin` over TCP. Using 127.0.0.1 rather than localhost
- * avoids the Unix socket, which the temporary server used to initialize a new
- * volume answers before the real server is listening.
+ * Images for a pinned version may predate `healthcheck.sh` (it was added to
+ * the images in 2023, and older tags were never rebuilt), so for those the
+ * script is used when present and `mysqladmin` is pinged over TCP otherwise.
+ * Using 127.0.0.1 rather than localhost avoids the Unix socket, which the
+ * temporary server used to initialize a new volume answers before the real
+ * server is listening.
  *
  * Timing is generous to support slow CI environments.
  *
@@ -99,15 +95,15 @@ const LEGACY_MARIADB_VERSIONS = [ '5', '5.5', '10.0', '10.1', '10.2', '10.3' ];
  * @return {Object} A docker-compose healthcheck object.
  */
 function getMariaDBHealthcheck( mariadbVersion ) {
-	const majorMinor = ( mariadbVersion ?? '' )
-		.split( '.' )
-		.slice( 0, 2 )
-		.join( '.' );
+	const isPinned =
+		!! mariadbVersion &&
+		mariadbVersion !== 'lts' &&
+		mariadbVersion !== 'latest';
 
-	const test = LEGACY_MARIADB_VERSIONS.includes( majorMinor )
+	const test = isPinned
 		? [
 				'CMD-SHELL',
-				'mysqladmin ping -h 127.0.0.1 --protocol=tcp -uroot -p"$$MYSQL_ROOT_PASSWORD"',
+				'if command -v healthcheck.sh > /dev/null; then healthcheck.sh --connect --innodb_initialized; else mysqladmin ping -h 127.0.0.1 --protocol=tcp -uroot -p"$$MYSQL_ROOT_PASSWORD"; fi',
 			]
 		: [ 'CMD', 'healthcheck.sh', '--connect', '--innodb_initialized' ];
 

@@ -206,10 +206,10 @@ describe( 'buildDockerComposeConfig', () => {
 			start_period: '60s',
 		};
 
-		const LEGACY_HEALTHCHECK = {
+		const PINNED_HEALTHCHECK = {
 			test: [
 				'CMD-SHELL',
-				'mysqladmin ping -h 127.0.0.1 --protocol=tcp -uroot -p"$$MYSQL_ROOT_PASSWORD"',
+				'if command -v healthcheck.sh > /dev/null; then healthcheck.sh --connect --innodb_initialized; else mysqladmin ping -h 127.0.0.1 --protocol=tcp -uroot -p"$$MYSQL_ROOT_PASSWORD"; fi',
 			],
 			interval: '5s',
 			timeout: '10s',
@@ -257,7 +257,7 @@ describe( 'buildDockerComposeConfig', () => {
 
 			expect( config.services.mysql.image ).toBe( 'mariadb:10.3' );
 			expect( config.services.mysql.healthcheck ).toEqual(
-				LEGACY_HEALTHCHECK
+				PINNED_HEALTHCHECK
 			);
 			expect( config.services[ 'tests-mysql' ].image ).toBe(
 				'mariadb:latest'
@@ -267,24 +267,36 @@ describe( 'buildDockerComposeConfig', () => {
 			);
 		} );
 
-		it.each( [ '5', '5.5', '10.0', '10.1', '10.2', '10.3', '10.3.39' ] )(
-			'uses the legacy health check for %j',
+		it.each( [
+			'5',
+			'5.5',
+			'10.0',
+			'10.3',
+			'10.3.39',
+			'10.5.8',
+			'10.6.4',
+			'10',
+			'10.11',
+			'11',
+			'11.4.2',
+		] )(
+			'uses the health check that detects healthcheck.sh for %j',
 			( version ) => {
 				const config = buildWithVersions( version, version );
 
 				expect( config.services.mysql.image ).toBe(
 					`mariadb:${ version }`
 				);
 				expect( config.services.mysql.healthcheck ).toEqual(
-					LEGACY_HEALTHCHECK
+					PINNED_HEALTHCHECK
 				);
 				expect( config.services[ 'tests-mysql' ].healthcheck ).toEqual(
-					LEGACY_HEALTHCHECK
+					PINNED_HEALTHCHECK
 				);
 			}
 		);
 
-		it.each( [ 'lts', 'latest', '10', '10.4', '10.11', '11', '11.4.2' ] )(
+		it.each( [ 'lts', 'latest' ] )(
 			'uses the current health check for %j',
 			( version ) => {
 				const config = buildWithVersions( version, version );