From 47ab60c7b372a4af6e034fc769935242c470b558 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 14:57:56 +0000
Subject: [PATCH 1/3] Initial plan


From f36c0584635149b9056f70c8f8e9fef6da9a2529 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:01:40 +0000
Subject: [PATCH 2/3] Fix MySQL socket wait: replace sleep 4 with retry loop in
 all Dockerfiles

---
 Dockerfile.php7.4 | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 Dockerfile.php8.4 | 2 +-
 Dockerfile.php8.5 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 8e707cd..72bdb5a 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index e720d38..bb901e8 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index f2673dc..35de30d 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 481ac7e..54c8667 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 62f27f4..591217c 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index f340339..e5f7466 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index b0716b7..2c79744 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php

From 154b400b7eef077b8af03c88d157712734515b7c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:02:31 +0000
Subject: [PATCH 3/3] Add 120-second timeout to MySQL readiness retry loop in
 all Dockerfiles

---
 Dockerfile.php7.4 | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 Dockerfile.php8.4 | 2 +-
 Dockerfile.php8.5 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 72bdb5a..1f2206b 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index bb901e8..961c0b1 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 35de30d..891cb0a 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 54c8667..881afc0 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 591217c..02c5492 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index e5f7466..525cb21 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index 2c79744..b7c62c1 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; done && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php