Changeset 56464

Timestamp:

08/24/2023 09:02:47 PM (16 months ago)

Author:

desrosj

Message:

Build/Test Tools: Ensure database containers are prepared for commands.

By default, Docker waits for a container to be started before considering it “ready”. But this does not necessarily mean that it’s ready to receive commands.

This adds a check that ensures the database container is ready to receive commands before proceeding with running commands.

Follow up to [56439], [56440], [56443].

Props rmccue, desrosj.
See #30462, #58867.

File:

• trunk/docker-compose.yml (modified) (5 diffs)

trunk/docker-compose.yml

@@ -26 +26 @@
 
     depends_on:
-      - php
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
 
   ##
@@ -52 +55 @@
     # Copy or delete the Memcached dropin plugin file as appropriate.
     command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm"
-
-    depends_on:
-      - mysql
 
     # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
@@ -84 +84 @@
     command: --default-authentication-plugin=mysql_native_password
 
+    healthcheck:
+      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
+      timeout: 5s
+      interval: 5s
+      retries: 10
+
   ##
   # The WP CLI container.
@@ -108 +114 @@
       - localhost:host-gateway
 
+    depends_on:
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
+
   ##
   # The Memcached container.
@@ -120 +132 @@
       - 11211:11211
 
+    depends_on:
+      php:
+        condition: service_started
+
 volumes:
   # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.