From 782a0aeae8b94f7bc6a28bbc8ea63e6ce18a67df Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 3 Jul 2024 17:41:36 +0000 Subject: [PATCH] Build/Test Tools: Change 5.5 default values of `LOCAL_PHP`/`LOCAL_DB_VERSION`. This changes the default values for `LOCAL_PHP` and `LOCAL_DB_VERSION` in the 5.5 branch from `latest` to `7.4-fpm` and `5.7`, respectively, to properly reflect the highest versions of PHP and MySQL that this branch will support. See #61533. git-svn-id: https://develop.svn.wordpress.org/branches/5.5@58668 602fd350-edb4-49c9-b593-d223f7449a82 --- .env | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index c4d09a0ca6856..b4c1338b27c23 100644 --- a/.env +++ b/.env @@ -16,7 +16,7 @@ LOCAL_PORT=8889 LOCAL_DIR=src # The PHP version to use. Valid options are 'latest', and '{version}-fpm'. -LOCAL_PHP=latest +LOCAL_PHP=7.4-fpm ## # The PHPUnit version to use when running tests. diff --git a/docker-compose.yml b/docker-compose.yml index 5caf08a61a638..66e903d609477 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: # The PHP container. ## php: - image: wordpressdevelop/php:${LOCAL_PHP-latest} + image: wordpressdevelop/php:${LOCAL_PHP-7.4-fpm} networks: - wpdevnet @@ -62,7 +62,7 @@ services: # The MySQL container. ## mysql: - image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} + image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.7} platform: linux/amd64 networks: @@ -121,7 +121,7 @@ services: # The PHPUnit container. ## phpunit: - image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-latest} + image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-7.4-fpm} networks: - wpdevnet