freshen up tests for updated images/versions

docs/config.md

@@ -302,7 +302,7 @@ Lando proxying is actually pretty powerful so definitely check out [the rest](ht
 
 ## Advanced Image Configuration
 
-Starting with version 5 of our Docker images (eg devwithlando/php:8.2-fpm-5), we now use Debian 12 (Bookworm) as the base image. If you need to use the previous Debian 11-based images, you can set the `suffix` option to `4` to use those older image versions (eg devwithlando/php:8.2-fpm-4):
+Starting with version 5 of our Docker images (eg devwithlando/php:8.2-fpm-6), we now use Debian 12 (Bookworm) as the base image. If you need to use the previous Debian 11-based images, you can set the `suffix` option to `4` to use those older image versions (eg devwithlando/php:8.2-fpm-4):
 
 ```yaml
 services:

examples/5.6/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:5.6-fpm-5
+      image: devwithlando/php:5.6-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.0/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.0-fpm-5
+      image: devwithlando/php:7.0-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.1/.lando.yml

@@ -28,7 +28,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.1-fpm-5
+      image: devwithlando/php:7.1-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.2/.lando.yml

@@ -28,7 +28,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.2-fpm-5
+      image: devwithlando/php:7.2-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.3/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.3-fpm-5
+      image: devwithlando/php:7.3-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.4/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.4-fpm-5
+      image: devwithlando/php:7.4-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.0/.lando.yml

@@ -26,7 +26,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.0-fpm-5
+      image: devwithlando/php:8.0-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.1/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.1-fpm-5
+      image: devwithlando/php:8.1-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.2/.lando.yml

@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.2-fpm-5
+      image: devwithlando/php:8.2-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.3/.lando.yml

@@ -9,7 +9,7 @@ services:
     type: php:8.3
     via: cli
     build_as_root:
-      - curl -sL https://deb.nodesource.com/setup_14.x | bash -
+      - curl -sL https://deb.nodesource.com/setup_22.x | bash -
       - apt-get update -y
       - apt-get install -y nodejs
   cliworker:
@@ -27,7 +27,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.3-fpm-5
+      image: devwithlando/php:8.3-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.3/README.md

@@ -24,8 +24,8 @@ Run the following commands to validate things are rolling as they should.
 # Should use 8.3 as the default php version
 lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.3"
 
-# Should use 13.x as the default postgresql-client version
-lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15."
+# Should use 17.x as the default postgresql-client version
+lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "17."
 
 # Should use apache 2.4 as the default webserver version
 lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4."
@@ -110,8 +110,8 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity
 # Should not install composer when composer_version is false
 echo $(lando exec cliworker -- composer --version --no-ansi 2>&1) | grep "executable file not found"
 
-# Should have node14 installed in cli service
-lando node -v | tee >(cat 1>&2) | grep v18.
+# Should have node22 installed in cli service
+lando node -v | tee >(cat 1>&2) | grep v22.
 ```
 
 ## Destroy tests

examples/8.4/.lando.yml

@@ -9,7 +9,7 @@ services:
     type: php:8.4
     via: cli
     build_as_root:
-      - curl -sL https://deb.nodesource.com/setup_18.x | bash -
+      - curl -sL https://deb.nodesource.com/setup_22.x | bash -
       - apt-get update -y
       - apt-get install -y nodejs
   cliworker:
@@ -26,7 +26,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.4-fpm-5
+      image: devwithlando/php:8.4-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.4/README.md

@@ -24,8 +24,8 @@ Run the following commands to validate things are rolling as they should.
 # Should use 8.4 as the default php version
 lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.4"
 
-# Should use 15.x as the default postgresql-client version
-lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15."
+# Should use 17.x as the default postgresql-client version
+lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "17."
 
 # Should use apache 2.4 as the default webserver version
 lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4."
@@ -107,8 +107,8 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity
 # Should not install composer when composer_version is false
 echo $(lando exec cliworker -- composer --version --no-ansi 2>&1) | grep "executable file not found"
 
-# Should have node 18 installed in cli service
-lando node -v | tee >(cat 1>&2) | grep v18.
+# Should have node 22 installed in cli service
+lando node -v | tee >(cat 1>&2) | grep v22.
 ```
 
 ## Destroy tests

examples/8.5/.lando.yml

@@ -9,7 +9,7 @@ services:
     type: php:8.5
     via: cli
     build_as_root:
-      - curl -sL https://deb.nodesource.com/setup_18.x | bash -
+      - curl -sL https://deb.nodesource.com/setup_22.x | bash -
       - apt-get update -y
       - apt-get install -y nodejs
   cliworker:
@@ -26,7 +26,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.5-fpm-5
+      image: devwithlando/php:8.5-fpm-6
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.5/README.md

@@ -24,8 +24,8 @@ Run the following commands to validate things are rolling as they should.
 # Should use 8.5 as the default php version
 lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.5"
 
-# Should use 15.x as the default postgresql-client version
-lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15."
+# Should use 17.x as the default postgresql-client version
+lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "17."
 
 # Should use apache 2.4 as the default webserver version
 lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4."
@@ -107,8 +107,8 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity
 # Should not install composer when composer_version is false
 echo $(lando exec cliworker -- composer --version --no-ansi 2>&1) | grep "executable file not found"
 
-# Should have node 18 installed in cli service
-lando node -v | tee >(cat 1>&2) | grep v18.
+# Should have node 22 installed in cli service
+lando node -v | tee >(cat 1>&2) | grep v22.
 ```
 
 ## Destroy tests

examples/composer/.lando.yml

@@ -4,38 +4,42 @@ services:
     type: php:7.2
   php83:
     type: php:8.3
+  php84:
+    type: php:8.4
+  php85:
+    type: php:8.5
   nocomposer:
-    type: php:8.3
+    type: php:8.4
     composer_version: false
   composer1:
     type: php:7.4
     composer_version: 1
   composer2:
-    type: php:8.3
+    type: php:8.4
     composer_version: 2
   composer1latest:
-    type: php:8.3
+    type: php:8.4
     composer_version: 1-latest
   composer2latest:
-    type: php:8.3
+    type: php:8.4
     composer_version: 2-latest
   composer1ver:
-    type: php:8.3
+    type: php:8.4
     composer_version: '1.10.26'
   composer2ver:
-    type: php:8.3
+    type: php:8.4
     composer_version: '2.1.10'
   composer22:
-    type: php:8.3
+    type: php:8.4
     composer_version: 2.2
   composer22latest:
     type: php
     composer_version: 2.2-latest
   composer22ver:
-    type: php:8.3
+    type: php:8.4
     composer_version: '2.2.10'
   dependencies:
-    type: php:8.3
+    type: php:8.4
     composer_version: 2
     composer:
       phpunit/phpunit: "*"

examples/composer/README.md

@@ -25,8 +25,10 @@ Run the following commands to validate things are rolling as they should.
 # PHP 7.2 Should install composer 2.2.x by default
 lando exec php72 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.2."
 
-# PHP 8.3 Should install composer 2.8.x by default
-lando exec php83 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.8."
+# Recent PHP versions should default to latest composer 2
+lando exec php83 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -Eq "Composer version 2\.(9|[1-9][0-9]+)\."
+lando exec php84 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -Eq "Composer version 2\.(9|[1-9][0-9]+)\."
+lando exec php85 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -Eq "Composer version 2\.(9|[1-9][0-9]+)\."
 
 # Should not install composer if composer_version is false
 echo $(lando exec nocomposer -- composer --version --no-ansi 2>&1) | grep "executable file not found"

examples/custom/.lando.yml

@@ -16,9 +16,9 @@ services:
     config:
       php: config/php.ini
       pool: config/www.conf
-    composer_version: '2.1.14'
+    composer_version: "2.1.14"
     overrides:
-      image: devwithlando/php:8.1-fpm-5
+      image: devwithlando/php:8.1-fpm-6
 tooling:
   node:
     service: :host

examples/custom/Dockerfile.node

@@ -1,4 +1,4 @@
-FROM devwithlando/php:7.4-apache-5
+FROM devwithlando/php:7.4-apache-6
 
 # Choose the major node version
 ENV NODE_VERSION=20

examples/php-extensions/Dockerfile.custom

@@ -1,8 +1,4 @@
-FROM devwithlando/php:8.3-apache-5
-
-# Add php extension helper
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+FROM devwithlando/php:8.4-apache-5
 
 # Install Oracle Instantclient, OCI8 and Microsoft SQL Server extensions
-RUN chmod +x /usr/local/bin/install-php-extensions && sync && \
-  install-php-extensions oci8 sqlsrv pdo_sqlsrv
+RUN install-php-extensions oci8 sqlsrv pdo_sqlsrv