Make WordPress Core

Changeset 63978


Ignore:
Timestamp:
09/28/2026 05:19:05 PM (43 hours ago)
Author:
lancewillett
Message:

Build/Test Tools: Check database readiness over TCP.

Use TCP for the database healthcheck so the temporary initialization server does not report readiness before the real server accepts connections. Use mysqladmin for older MariaDB versions and preserve failed ping status.

Merges the docker-compose.yml changes from [59484], [59489], and [63871] to the 6.7 branch.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/13749

Reviewed by: jorbin.
Props lucatume.
See #66117.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/6.7/docker-compose.yml

    • Property svn:mergeinfo set to
      /branches/3.1/docker-compose.yml18031
      /branches/3.3/docker-compose.yml20543
      /branches/3.4/docker-compose.yml21757
      /branches/4.9/docker-compose.yml43557,​43622
      /branches/5.0/docker-compose.yml43681-43682,​43684-43688,​43719-43720,​43723,​43726-43727,​43729-43731,​43734-43744,​43747,​43751-43754,​43758,​43760-43765,​43767-43770,​43772,​43774-43781,​43783,​43785,​43790-43806,​43808-43821,​43825,​43828,​43830-43834,​43836-43843,​43846-43863,​43867-43889,​43891-43894,​43897-43905,​43908-43909,​43911-43929,​43931-43942,​43946-43947,​43949-43956,​43959-43964,​43967-43969,​43988,​43994,​44014,​44017,​44047,​44183,​44185,​44187-44206,​44208-44213,​44231-44232,​44235,​44248,​44284,​44287-44288
      /branches/5.5/docker-compose.yml49373-49379,​49381
      /branches/5.8/docker-compose.yml51889
      /branches/7.0/docker-compose.yml62876
      /trunk/docker-compose.yml58570,​59279-59280,​59283,​59286,​59289-59290,​59293,​59306-59307,​59314-59319,​59325-59326,​59329-59330,​59339,​59341,​59344,​59346-59348,​59358,​59362,​59366,​59368,​59374,​59379-59380,​59382,​59386,​59391-59392,​59398-59399,​59407,​59409-59410,​59413-59416,​59422,​59424,​59426-59427,​59430-59431,​59448,​59451,​59454,​59464,​59482,​59484,​59489,​59510,​59536,​59540,​59544,​59555,​59580,​59682,​59727,​59730,​59739-59740,​59742,​59746,​59772-59773,​59809,​59950,​59969,​60320,​60691,​60735-60736,​60814-60816,​61146,​61879-61890,​61913,​62871,​62937,​63037,​63060-63065,​63067,​63309,​63792,​63871
    r62980 r63978  
    8282    command: ${LOCAL_DB_AUTH_OPTION-}
    8383
     84    # Ping over TCP: the client resolves the literal `localhost` to the Unix socket, which the
     85    # temporary `--skip-networking` server used to initialise a cold volume answers long before
     86    # the real server listens on port 3306.
    8487    healthcheck:
    85       test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
     88      test: [
     89        'CMD-SHELL',
     90        'if [ "$LOCAL_DB_TYPE" = "mariadb" ]; then case "$LOCAL_DB_VERSION" in 5.5|10.0|10.1|10.2|10.3) mysqladmin ping -h 127.0.0.1 --protocol=tcp || exit $$?;; *) mariadb-admin ping -h 127.0.0.1 --protocol=tcp || exit $$?;; esac; else mysqladmin ping -h 127.0.0.1 --protocol=tcp || exit $$?; fi'
     91      ]
    8692      timeout: 5s
    8793      interval: 5s
Note: See TracChangeset for help on using the changeset viewer.