Changeset 58302 for branches/6.2/docker-compose.yml

Timestamp:

06/03/2024 05:36:35 PM (6 months ago)

Author:

desrosj

Message:

Build/Test Tools: Include files missed in [58301].

Unprops desrosj.
See #61340, #60822, #61216, #60901, #61101, #59416, #59805, #61213.

Location:

branches/6.2

Files:

• . (modified) (1 prop)
• docker-compose.yml (modified) (7 diffs)

branches/6.2/docker-compose.yml

@@ -1 @@
-version: '3.7'
-
 services:
 
@@ -26 +24 @@
 
     depends_on:
-      - php
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
 
   ##
@@ -53 +54 @@
     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.
     init: true
@@ -66 +64 @@
   ##
   mysql:
-    image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
+    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
+    platform: linux/amd64
 
     networks:
@@ -83 +82 @@
     # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0.
     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
 
   ##
@@ -108 +113 @@
       - localhost:host-gateway
 
+    depends_on:
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
+
   ##
   # The Memcached container.
@@ -120 +131 @@
       - 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.