From 301cbe42f48ef93784c720308838d7e2a7da6a17 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 2 Dec 2024 14:12:53 -0600 Subject: [PATCH 1/4] use 5g images --- .github/workflows/build-php-images.yml | 44 ++++---- .github/workflows/pr-docs-tests.yml | 2 +- .github/workflows/pr-linter.yml | 2 +- .github/workflows/pr-php-tests.yml | 2 +- .github/workflows/pr-unit-tests.yml | 2 +- builders/php.js | 2 +- docs/caveats.md | 2 +- docs/config.md | 28 +++-- docs/extensions.md | 8 +- docs/guides/installing-extensions.md | 2 +- docs/guides/installing-node.md | 4 +- docs/index.md | 6 +- examples/5.6/.lando.yml | 2 +- examples/7.0/.lando.yml | 2 +- examples/7.1/.lando.yml | 2 +- examples/7.2/.lando.yml | 2 +- examples/7.3/.lando.yml | 2 +- examples/7.4/.lando.yml | 2 +- examples/8.0/.lando.yml | 2 +- examples/8.1/.lando.yml | 2 +- examples/8.2/.lando.yml | 2 +- examples/8.3/.lando.yml | 2 +- examples/8.4/.lando.yml | 2 +- examples/custom/.lando.yml | 2 +- examples/custom/Dockerfile.node | 2 +- examples/php-extensions/Dockerfile.custom | 2 +- images/5.6-apache/Dockerfile | 2 +- images/5.6-fpm/Dockerfile | 2 +- images/7.0-apache/Dockerfile | 2 +- images/7.0-fpm/Dockerfile | 2 +- images/7.1-apache/Dockerfile | 2 +- images/7.1-fpm/Dockerfile | 2 +- images/7.2-apache/Dockerfile | 2 +- images/7.2-fpm/Dockerfile | 2 +- images/7.3-apache/Dockerfile | 2 +- images/7.3-fpm/Dockerfile | 2 +- images/7.4-apache/Dockerfile | 2 +- images/7.4-fpm/Dockerfile | 2 +- images/8.0-apache/Dockerfile | 2 +- images/8.0-fpm/Dockerfile | 2 +- images/8.1-apache/Dockerfile | 125 +++++++++------------ images/8.1-fpm/Dockerfile | 126 +++++++++------------- images/8.2-apache/Dockerfile | 125 +++++++++------------ images/8.2-fpm/Dockerfile | 126 +++++++++------------- images/8.3-apache/Dockerfile | 125 +++++++++------------ images/8.3-fpm/Dockerfile | 126 +++++++++------------- images/8.4-apache/Dockerfile | 3 +- images/8.4-fpm/Dockerfile | 2 +- 48 files changed, 391 insertions(+), 527 deletions(-) diff --git a/.github/workflows/build-php-images.yml b/.github/workflows/build-php-images.yml index 01efeb26..408f5773 100644 --- a/.github/workflows/build-php-images.yml +++ b/.github/workflows/build-php-images.yml @@ -17,70 +17,70 @@ jobs: matrix: include: - image: php - tag: 8.4-fpm-4 + tag: 8.4-fpm-5 context: images/8.4-fpm - image: php - tag: 8.4-apache-4 + tag: 8.4-apache-5 context: images/8.4-apache - image: php - tag: 8.3-fpm-4 + tag: 8.3-fpm-5 context: images/8.3-fpm - image: php - tag: 8.3-apache-4 + tag: 8.3-apache-5 context: images/8.3-apache - image: php - tag: 8.2-fpm-4 + tag: 8.2-fpm-5 context: images/8.2-fpm - image: php - tag: 8.2-apache-4 + tag: 8.2-apache-5 context: images/8.2-apache - image: php - tag: 8.1-fpm-4 + tag: 8.1-fpm-5 context: images/8.1-fpm - image: php - tag: 8.1-apache-4 + tag: 8.1-apache-5 context: images/8.1-apache - image: php - tag: 8.0-fpm-4 + tag: 8.0-fpm-5 context: images/8.0-fpm - image: php - tag: 8.0-apache-4 + tag: 8.0-apache-5 context: images/8.0-apache - image: php - tag: 7.4-fpm-4 + tag: 7.4-fpm-5 context: images/7.4-fpm - image: php - tag: 7.4-apache-4 + tag: 7.4-apache-5 context: images/7.4-apache - image: php - tag: 7.3-fpm-4 + tag: 7.3-fpm-5 context: images/7.3-fpm - image: php - tag: 7.3-apache-4 + tag: 7.3-apache-5 context: images/7.3-apache - image: php - tag: 7.2-fpm-4 + tag: 7.2-fpm-5 context: images/7.2-fpm - image: php - tag: 7.2-apache-4 + tag: 7.2-apache-5 context: images/7.2-apache - image: php - tag: 7.1-fpm-4 + tag: 7.1-fpm-5 context: images/7.1-fpm - image: php - tag: 7.1-apache-4 + tag: 7.1-apache-5 context: images/7.1-apache - image: php - tag: 7.0-fpm-4 + tag: 7.0-fpm-5 context: images/7.0-fpm - image: php - tag: 7.0-apache-4 + tag: 7.0-apache-5 context: images/7.0-apache - image: php - tag: 5.6-fpm-4 + tag: 5.6-fpm-5 context: images/5.6-fpm - image: php - tag: 5.6-apache-4 + tag: 5.6-apache-5 context: images/5.6-apache steps: diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml index ea07050a..3537cb8b 100644 --- a/.github/workflows/pr-docs-tests.yml +++ b/.github/workflows/pr-docs-tests.yml @@ -11,7 +11,7 @@ jobs: os: - ubuntu-24.04 node-version: - - '18' + - '20' steps: # Install deps and cache - name: Checkout code diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index dcad3033..0c1f5a40 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -11,7 +11,7 @@ jobs: os: - ubuntu-24.04 node-version: - - '18' + - '20' steps: # Install deps and cache - name: Checkout code diff --git a/.github/workflows/pr-php-tests.yml b/.github/workflows/pr-php-tests.yml index 71a8b38b..7f1cf974 100644 --- a/.github/workflows/pr-php-tests.yml +++ b/.github/workflows/pr-php-tests.yml @@ -32,7 +32,7 @@ jobs: os: - ubuntu-24.04 node-version: - - '18' + - '20' steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index 85024b5e..ee1d337b 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -13,7 +13,7 @@ jobs: - ubuntu-24.04 - macos-12 node-version: - - '18' + - '20' steps: # Install deps and cache - name: Checkout code diff --git a/builders/php.js b/builders/php.js index e2bea9b9..29422557 100644 --- a/builders/php.js +++ b/builders/php.js @@ -127,7 +127,7 @@ module.exports = { pool: '/usr/local/etc/php-fpm.d/zz-lando.conf', }, sources: [], - suffix: '4', + suffix: '5', ssl: false, via: 'apache', volumes: ['/usr/local/bin'], diff --git a/docs/caveats.md b/docs/caveats.md index 93e4e722..96bcaaa4 100644 --- a/docs/caveats.md +++ b/docs/caveats.md @@ -25,4 +25,4 @@ Lando will set the `PATH` hierarchy for this service as follows: ] ``` -This is useful to note if you are not using absolute paths in any [tooling routes](https://docs.lando.dev/core/v3/tooling.html) and are getting the unexpected version of a particular utility. +This is useful to note if you are not using absolute paths in any [tooling routes](https://docs.lando.dev/landofile/tooling.html) and are getting the unexpected version of a particular utility. diff --git a/docs/config.md b/docs/config.md index 7680fec2..b13cd45c 100644 --- a/docs/config.md +++ b/docs/config.md @@ -5,9 +5,9 @@ description: Learn how to configure the Lando PHP service. # Configuration -Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/services/lando.html) to get a good handle on how the magicks work. +Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/services/lando-3.html) to get a good handle on how the magicks work. -Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides) that are available to every service, are shown below: +Also note that options, in addition to the [build steps](https://docs.lando.dev/services/lando-3.html#build-steps) and [overrides](https://docs.lando.dev/services/lando-3.html#overrides) that are available to every service, are shown below: ```yaml services: @@ -193,9 +193,9 @@ composer_version: snapshot You can also use the `composer` key if you need to require any [global composer dependenices](https://getcomposer.org/doc/03-cli.md#require). This follows the same syntax as your normal [`composer.json`](https://getcomposer.org/doc/01-basic-usage.md#composer-json-project-setup) except written as YAML instead of JSON. ::: tip Use composer.json if you can -While there are some legitimate use cases to globally install a composer dependency, it is almost always preferred to install using your applications normal `composer.json` and then running either `lando composer install` or alternatively setting up a [build step](https://docs.lando.dev/core/v3/services/lando.html#build-steps) that will automatically run before your app starts up. +While there are some legitimate use cases to globally install a composer dependency, it is almost always preferred to install using your applications normal `composer.json` and then running either `lando composer install` or alternatively setting up a [build step](https://docs.lando.dev/services/lando-3.html#build-steps) that will automatically run before your app starts up. -Note that `lando composer` is not provided out of the box by the `php` service and needs to be manually added by configuring your app's [tooling](https://docs.lando.dev/core/v3/tooling.html). +Note that `lando composer` is not provided out of the box by the `php` service and needs to be manually added by configuring your app's [tooling](https://docs.lando.dev/landofile/tooling.html). ::: An example of globally installing `phpunit/phpunit` `^6.5` is shown below: @@ -208,7 +208,7 @@ services: phpunit/phpunit: ^6.5 ``` -An example of using a [build step](https://docs.lando.dev/core/v3/services/lando.html#build-steps) to automatically `composer install` your dependencies before your app starts is shown below: +An example of using a [build step](https://docs.lando.dev/services/lando-3.html#build-steps) to automatically `composer install` your dependencies before your app starts is shown below: ```yaml services: @@ -273,7 +273,7 @@ lando php lando composer ``` -Lando tooling is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/core/v3/tooling.html) of its cool features. +Lando tooling is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/landofile/tooling.html) of its cool features. ## Adding routing @@ -286,4 +286,18 @@ proxy: - something.else.local ``` -Lando proxying is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/core/v3/proxy.html) of its cool features. +Lando proxying is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/landofile/proxy.html) of its cool features. + +## 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): + +```yaml +services: + myservice: + type: php:8.2 + suffix: 4 +``` + +Most users will never need to modify this setting, as it's primarily useful when specific dependency versions from Debian 11 are required. + diff --git a/docs/extensions.md b/docs/extensions.md index 111e2873..134d51c9 100644 --- a/docs/extensions.md +++ b/docs/extensions.md @@ -75,11 +75,11 @@ Note that imagick is temporarily unavailable on PHP 8.3/8.4, due to a pending is There are a few ways you can extend or modify our php images below: -* Using [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps). -* Using your own image with [service overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides). -* Building from your own local Dockerfile [service overrides](https://docs.lando.dev/core/v3/services/lando.html#using-dockerfiles). +* Using [build steps](https://docs.lando.dev/services/lando-3.html#build-steps). +* Using your own image with [service overrides](https://docs.lando.dev/services/lando-3.html#overrides). +* Building from your own local Dockerfile [service overrides](https://docs.lando.dev/services/lando-3.html#using-dockerfiles). -Consider the example that uses [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps) to install the `memcached` php extension as follows: +Consider the example that uses [build steps](https://docs.lando.dev/services/lando-3.html#build-steps) to install the `memcached` php extension as follows: ```yaml services: diff --git a/docs/guides/installing-extensions.md b/docs/guides/installing-extensions.md index 9a58489c..593c884b 100644 --- a/docs/guides/installing-extensions.md +++ b/docs/guides/installing-extensions.md @@ -27,7 +27,7 @@ Also note that you may need to adapt these slightly depending on the PHP version ## 1. Using build steps -If installing your PHP extension is fairly trivial and not a long-running operation you may wish to simply use Lando [build-steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps) +If installing your PHP extension is fairly trivial and not a long-running operation you may wish to simply use Lando [build-steps](https://docs.lando.dev/services/lando-3.html#build-steps) Here is an example that uses build-steps to install the `xsl` and `stats` extensions. diff --git a/docs/guides/installing-node.md b/docs/guides/installing-node.md index 7af5d85f..39a1e263 100644 --- a/docs/guides/installing-node.md +++ b/docs/guides/installing-node.md @@ -25,7 +25,7 @@ We've found installing `node` inside a Lando PHP service to generally be the pat ## 1. Using build steps -Below is an example that installs `node12` using [build-steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps). +Below is an example that installs `node12` using [build-steps](https://docs.lando.dev/services/lando-3.html#build-steps). ```yaml services: @@ -52,7 +52,7 @@ lando npm -v ## 2. Extending a Dockerfile -If you are planning to extend your service with _additional_ build steps or would like to cache the build steps for a faster `lando rebuild` you should instead consider [extending with a Dockerfile](https://docs.lando.dev/core/v3/services/lando.html#using-dockerfiles) as in the example below: +If you are planning to extend your service with _additional_ build steps or would like to cache the build steps for a faster `lando rebuild` you should instead consider [extending with a Dockerfile](https://docs.lando.dev/services/lando-3.html#using-dockerfiles) as in the example below: **.lando.yml** diff --git a/docs/index.md b/docs/index.md index 050ba427..45240e53 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ next: ./config.html [PHP](https://www.php.net/) is a popular scripting language that is especially suited for web development. It is often served by either [apache](https://docs.lando.dev/plugins/apache/) or [nginx](https://docs.lando.dev/plugins/nginx/). -You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/services/lando.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3). +You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/services/lando-3.html) top-level config in your [Landofile](https://docs.lando.dev). ```yaml services: @@ -27,7 +27,7 @@ services: * [8.0](https://hub.docker.com/r/devwithlando/php) * **[7.4](https://hub.docker.com/r/devwithlando/php)** **(default)** * [7.3](https://hub.docker.com/r/devwithlando/php) -* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides) +* [custom](https://docs.lando.dev/services/lando-3.html#overrides) ## Legacy versions @@ -49,5 +49,5 @@ You can still run these versions with Lando but for all intents and purposes the Because we use our own custom images for `php`, specifying a patch version is not currently supported. -If you **really** need to lock down to a patch version, you could consider using either a [custom compose service](https://docs.lando.dev/plugins/compose) or a service [overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides). +If you **really** need to lock down to a patch version, you could consider using either a [custom compose service](https://docs.lando.dev/plugins/compose) or a service [overrides](https://docs.lando.dev/services/lando-3.html#overrides). diff --git a/examples/5.6/.lando.yml b/examples/5.6/.lando.yml index 099b1626..e6bcef53 100644 --- a/examples/5.6/.lando.yml +++ b/examples/5.6/.lando.yml @@ -25,7 +25,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:5.6-fpm-4 + image: devwithlando/php:5.6-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.0/.lando.yml b/examples/7.0/.lando.yml index 870ce6d6..2066ec54 100644 --- a/examples/7.0/.lando.yml +++ b/examples/7.0/.lando.yml @@ -30,7 +30,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.0-fpm-4 + image: devwithlando/php:7.0-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.1/.lando.yml b/examples/7.1/.lando.yml index d1956beb..1dcc2ed6 100644 --- a/examples/7.1/.lando.yml +++ b/examples/7.1/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.1-fpm-4 + image: devwithlando/php:7.1-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.2/.lando.yml b/examples/7.2/.lando.yml index 82a31aa3..7606cced 100644 --- a/examples/7.2/.lando.yml +++ b/examples/7.2/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.2-fpm-4 + image: devwithlando/php:7.2-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.3/.lando.yml b/examples/7.3/.lando.yml index fd4eb34d..d710e303 100644 --- a/examples/7.3/.lando.yml +++ b/examples/7.3/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.3-fpm-4 + image: devwithlando/php:7.3-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.4/.lando.yml b/examples/7.4/.lando.yml index 981b7c5d..1c06da60 100644 --- a/examples/7.4/.lando.yml +++ b/examples/7.4/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.4-fpm-4 + image: devwithlando/php:7.4-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/8.0/.lando.yml b/examples/8.0/.lando.yml index 406c39fa..dc61acc9 100644 --- a/examples/8.0/.lando.yml +++ b/examples/8.0/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:8.0-fpm-4 + image: devwithlando/php:8.0-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/8.1/.lando.yml b/examples/8.1/.lando.yml index 7fefbff7..36917c10 100644 --- a/examples/8.1/.lando.yml +++ b/examples/8.1/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:8.1-fpm-4 + image: devwithlando/php:8.1-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/8.2/.lando.yml b/examples/8.2/.lando.yml index e5b7461a..c100081b 100644 --- a/examples/8.2/.lando.yml +++ b/examples/8.2/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:8.2-fpm-4 + image: devwithlando/php:8.2-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/8.3/.lando.yml b/examples/8.3/.lando.yml index 42291716..59d162dc 100644 --- a/examples/8.3/.lando.yml +++ b/examples/8.3/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:8.3-fpm-4 + image: devwithlando/php:8.3-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/8.4/.lando.yml b/examples/8.4/.lando.yml index 7261c324..ea1ba1e8 100644 --- a/examples/8.4/.lando.yml +++ b/examples/8.4/.lando.yml @@ -28,7 +28,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:8.4-fpm-4 + image: devwithlando/php:8.4-fpm-5 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/custom/.lando.yml b/examples/custom/.lando.yml index d96d40af..ca070266 100644 --- a/examples/custom/.lando.yml +++ b/examples/custom/.lando.yml @@ -18,7 +18,7 @@ services: pool: config/www.conf composer_version: '2.1.14' overrides: - image: devwithlando/php:8.1-fpm-4 + image: devwithlando/php:8.1-fpm-5 tooling: node: service: :host diff --git a/examples/custom/Dockerfile.node b/examples/custom/Dockerfile.node index 3f73dff2..e7b48183 100644 --- a/examples/custom/Dockerfile.node +++ b/examples/custom/Dockerfile.node @@ -1,4 +1,4 @@ -FROM devwithlando/php:7.4-apache-4 +FROM devwithlando/php:7.4-apache-5 # Choose the major node version ENV NODE_VERSION=12 diff --git a/examples/php-extensions/Dockerfile.custom b/examples/php-extensions/Dockerfile.custom index e63c32bd..f778a47e 100644 --- a/examples/php-extensions/Dockerfile.custom +++ b/examples/php-extensions/Dockerfile.custom @@ -1,4 +1,4 @@ -FROM devwithlando/php:7.4-apache-4 +FROM devwithlando/php:7.4-apache-5 # Add php extension helper ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ diff --git a/images/5.6-apache/Dockerfile b/images/5.6-apache/Dockerfile index 4ec148a6..96aff7ba 100644 --- a/images/5.6-apache/Dockerfile +++ b/images/5.6-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:5.6-apache-4 . +# docker build -t devwithlando/php:5.6-apache-5 . FROM php:5.6-apache-stretch diff --git a/images/5.6-fpm/Dockerfile b/images/5.6-fpm/Dockerfile index e23e1cd0..b5ed475c 100644 --- a/images/5.6-fpm/Dockerfile +++ b/images/5.6-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:5.6-fpm-4 . +# docker build -t devwithlando/php:5.6-fpm-5 . FROM php:5.6-fpm-stretch diff --git a/images/7.0-apache/Dockerfile b/images/7.0-apache/Dockerfile index 7c7b301b..0632208f 100644 --- a/images/7.0-apache/Dockerfile +++ b/images/7.0-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.0-apache-4 . +# docker build -t devwithlando/php:7.0-apache-5 . FROM php:7.0-apache-stretch diff --git a/images/7.0-fpm/Dockerfile b/images/7.0-fpm/Dockerfile index 9fa851c5..7ef13af6 100644 --- a/images/7.0-fpm/Dockerfile +++ b/images/7.0-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.0-fpm-4 . +# docker build -t devwithlando/php:7.0-fpm-5 . FROM php:7.0-fpm-stretch diff --git a/images/7.1-apache/Dockerfile b/images/7.1-apache/Dockerfile index 59391452..7e17c304 100644 --- a/images/7.1-apache/Dockerfile +++ b/images/7.1-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.1-apache-4 . +# docker build -t devwithlando/php:7.1-apache-5 . FROM php:7.1-apache-buster diff --git a/images/7.1-fpm/Dockerfile b/images/7.1-fpm/Dockerfile index 8f3b39e4..32697093 100644 --- a/images/7.1-fpm/Dockerfile +++ b/images/7.1-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.1-fpm-4 . +# docker build -t devwithlando/php:7.1-fpm-5 . FROM php:7.1-fpm-buster diff --git a/images/7.2-apache/Dockerfile b/images/7.2-apache/Dockerfile index 2b63ee32..da838d38 100644 --- a/images/7.2-apache/Dockerfile +++ b/images/7.2-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.2-apache-4 . +# docker build -t devwithlando/php:7.2-apache-5 . FROM php:7.2-apache-buster diff --git a/images/7.2-fpm/Dockerfile b/images/7.2-fpm/Dockerfile index cc1ce8ea..771a522e 100644 --- a/images/7.2-fpm/Dockerfile +++ b/images/7.2-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.2-fpm-4 . +# docker build -t devwithlando/php:7.2-fpm-5 . FROM php:7.2-fpm-buster diff --git a/images/7.3-apache/Dockerfile b/images/7.3-apache/Dockerfile index 63798176..c5dbc56f 100644 --- a/images/7.3-apache/Dockerfile +++ b/images/7.3-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.3-apache-4 . +# docker build -t devwithlando/php:7.3-apache-5 . FROM php:7.3-apache-bullseye diff --git a/images/7.3-fpm/Dockerfile b/images/7.3-fpm/Dockerfile index f71606e9..a2f50569 100644 --- a/images/7.3-fpm/Dockerfile +++ b/images/7.3-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.3-fpm-4 . +# docker build -t devwithlando/php:7.3-fpm-5 . FROM php:7.3-fpm-bullseye diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index fb4db3d5..27ab36ea 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.4-apache-4 . +# docker build -t devwithlando/php:7.4-apache-5 . FROM php:7.4-apache-bullseye diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index 8bc14486..7b8d84d8 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.4-fpm-4 . +# docker build -t devwithlando/php:7.4-fpm-5 . FROM php:7.4-fpm-bullseye diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 1975c517..c708282e 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.0-apache-4 . +# docker build -t devwithlando/php:8.0-apache-5 . FROM php:8.0-apache-bullseye diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index 97003c8d..47839cf3 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.0-fpm-4 . +# docker build -t devwithlando/php:8.0-fpm-5 . FROM php:8.0-fpm-bullseye diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile index 9f92fd3a..17d23316 100644 --- a/images/8.1-apache/Dockerfile +++ b/images/8.1-apache/Dockerfile @@ -1,81 +1,56 @@ -# docker build -t devwithlando/php:8.1-apache-4 . +# docker build -t devwithlando/php:8.1-apache-5 . -FROM php:8.1-apache-bullseye +FROM php:8.1-apache-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install imagick \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-5.3.7 \ - && pecl install xdebug \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable imagick \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile index c01d034c..520e882d 100644 --- a/images/8.1-fpm/Dockerfile +++ b/images/8.1-fpm/Dockerfile @@ -1,82 +1,56 @@ -# docker build -t devwithlando/php:8.1-fpm-4 . +# docker build -t devwithlando/php:8.1-fpm-5 . -FROM php:8.1-fpm-bullseye +FROM php:8.1-fpm-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install imagick \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-5.3.7 \ - && pecl install xdebug \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable imagick \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -# Tests -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile index 55886be5..34443096 100644 --- a/images/8.2-apache/Dockerfile +++ b/images/8.2-apache/Dockerfile @@ -1,81 +1,56 @@ -# docker build -t devwithlando/php:8.2-apache-4 . +# docker build -t devwithlando/php:8.2-apache-5 . -FROM php:8.2-apache-bullseye +FROM php:8.2-apache-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install imagick \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-5.3.7 \ - && pecl install xdebug \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable imagick \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.18 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile index 4901106f..1b082e2d 100644 --- a/images/8.2-fpm/Dockerfile +++ b/images/8.2-fpm/Dockerfile @@ -1,82 +1,56 @@ -# docker build -t devwithlando/php:8.2-fpm-4 . +# docker build -t devwithlando/php:8.2-fpm-5 . -FROM php:8.2-fpm-bullseye +FROM php:8.2-fpm-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install imagick \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-5.3.7 \ - && pecl install xdebug \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable imagick \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.18 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -# Tests -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index 40709a8a..2b932065 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -1,79 +1,56 @@ -# docker build -t devwithlando/php:8.3-apache-4 . +# docker build -t devwithlando/php:8.3-apache-5 . -FROM php:8.3-apache-bullseye +FROM php:8.3-apache-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt-get update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-6.0.2 \ - && pecl install xdebug-3.3.1 \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.22 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt -y update && apt-get install -y \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index 34c8fadd..daab20bd 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -1,80 +1,56 @@ -# docker build -t devwithlando/php:8.3-fpm-4 . +# docker build -t devwithlando/php:8.3-fpm-5 . -FROM php:8.3-fpm-bullseye +FROM php:8.3-fpm-bookworm -# Install dependencies we need -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt-get update && apt-get install -y \ - bzip2 \ - default-mysql-client \ - exiftool \ - git-core \ - gnupg2 \ - imagemagick \ - libbz2-dev \ - libc-client-dev \ - libfreetype6-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickwand-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml2-dev \ - libzip-dev \ - libonig-dev \ - openssl \ - postgresql-client-13 \ - pv \ - rsync \ - ssh \ - unzip \ - wget \ - xfonts-75dpi \ - xfonts-base \ - zlib1g-dev \ - && pecl install apcu \ - && pecl install memcached \ - && pecl install oauth \ - && pecl install redis-6.0.2 \ - && pecl install xdebug-3.3.1 \ - && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ - && docker-php-ext-enable apcu \ - && docker-php-ext-enable memcached \ - && docker-php-ext-enable oauth \ - && docker-php-ext-enable redis \ - && docker-php-ext-install bcmath \ - && docker-php-ext-install bz2 \ - && docker-php-ext-install calendar \ - && docker-php-ext-install exif \ - && docker-php-ext-install gettext \ - && docker-php-ext-install intl \ - && docker-php-ext-install ldap \ - && docker-php-ext-install mbstring \ - && docker-php-ext-install mysqli \ - && docker-php-ext-install opcache \ - && docker-php-ext-install pcntl \ - && docker-php-ext-install pdo \ - && docker-php-ext-install pdo_mysql \ - && docker-php-ext-install pdo_pgsql \ - && docker-php-ext-install soap \ - && docker-php-ext-install zip \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.22 \ - && php -r "unlink('composer-setup.php');" \ - && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ + +RUN \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt -y update && apt-get install -y \ + default-mysql-client \ + exiftool \ + git-core \ + gnupg2 \ + openssl \ + postgresql-client-15 \ + pv \ + rsync \ + ssh \ + unzip \ + wget + +RUN \ + install-php-extensions @fix_letsencrypt \ + && install-php-extensions apcu \ + && install-php-extensions bcmath \ + && install-php-extensions bz2 \ + && install-php-extensions calendar \ + && install-php-extensions exif \ + && install-php-extensions gd \ + && install-php-extensions gettext \ + && install-php-extensions imagick \ + && install-php-extensions imap \ + && install-php-extensions intl \ + && install-php-extensions ldap \ + && install-php-extensions mbstring \ + && install-php-extensions memcached \ + && install-php-extensions mysqli \ + && install-php-extensions oauth \ + && install-php-extensions opcache \ + && install-php-extensions pcntl \ + && install-php-extensions pdo \ + && install-php-extensions pdo_mysql \ + && install-php-extensions pdo_pgsql \ + && install-php-extensions redis \ + && install-php-extensions soap \ + && install-php-extensions xdebug \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +RUN \ + chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ && apt-get -y autoclean \ && apt-get -y autoremove \ - && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install imap \ - && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \ - && docker-php-ext-install gd - -# Tests -RUN curl https://dl.yarnpkg.com + && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index 7058a771..ca90794c 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.4-apache-4 . +# docker build -t devwithlando/php:8.4-apache-5 . FROM php:8.4-apache-bookworm @@ -7,7 +7,6 @@ ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/relea RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ - bzip2 \ default-mysql-client \ exiftool \ git-core \ diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index b76155e4..b6df21d9 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.4-fpm-4 . +# docker build -t devwithlando/php:8.4-fpm-5 . FROM php:8.4-fpm-bookworm From 016661c2a2dc8d37ca0798d51bc69b522ded95ba Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Wed, 20 Nov 2024 13:28:15 -0600 Subject: [PATCH 2/4] some dependency updates --- package-lock.json | 30 ++++++++++++++++-------------- package.json | 8 ++++---- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90915ea5..3101b09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "1.6.1", "license": "GPL-3.0", "dependencies": { - "@lando/nginx": "^1.3.0", + "@lando/nginx": "^1.4.1", "lodash": "^4.17.21", - "semver": "^7.3.7" + "semver": "^7.6.3" }, "devDependencies": { - "@babel/eslint-parser": "^7.16.0", - "@lando/leia": "0.6.5", + "@babel/eslint-parser": "^7.25.9", + "@lando/leia": "0.6.7", "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24", "chai": "^4.3.4", "command-line-test": "^1.0.10", @@ -424,10 +424,11 @@ } }, "node_modules/@babel/eslint-parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz", - "integrity": "sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.9.tgz", + "integrity": "sha512-5UXfgpK0j0Xr/xIdgdLEhOFxaDZ0bRPWJJchRpqOSur/3rZoPbqqki5mm0p4NE2cs28krBEiSM2MB7//afRSQQ==", "dev": true, + "license": "MIT", "dependencies": { "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", "eslint-visitor-keys": "^2.1.0", @@ -438,7 +439,7 @@ }, "peerDependencies": { "@babel/core": "^7.11.0", - "eslint": "^7.5.0 || ^8.0.0" + "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0" } }, "node_modules/@babel/eslint-parser/node_modules/semver": { @@ -1360,10 +1361,11 @@ } }, "node_modules/@lando/leia": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/@lando/leia/-/leia-0.6.5.tgz", - "integrity": "sha512-CssUrscDgc7ruw4IRkdmPHumgK7X6THBD71XUgyUREEi2sx5nkgL828hqJHwm8VOLCWm5ZIQxLsprstjai69MA==", + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@lando/leia/-/leia-0.6.7.tgz", + "integrity": "sha512-1ldWSeDABuELs4mDcmIFVbl3yB/hVWDjk1f8SFtNGwouR3SAPezoQ67EpCM+4WVnuLk4e2Q0y4dkOeNf14b6wg==", "dev": true, + "license": "GPL-3.0", "dependencies": { "@lando/argv": "^1.0.6", "@oclif/command": "^1.8.0", @@ -1567,9 +1569,9 @@ } }, "node_modules/@lando/nginx": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-1.3.0.tgz", - "integrity": "sha512-ln1pxPOLvX+eK7LDTqTKbwAGPdHoL3o1WBA2cKCP/czsTbAAjQauwtZ7YNGzFjmQgxV6ZxHFpMJvYGezPI9MQw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-1.4.1.tgz", + "integrity": "sha512-9wY/dp9mYTQvQIMBFUdVQN7pC3uP0oLfVITF5W9sPqGytVPDZYZl2UescD74+Omy9A2h+AfUW87YXJDLCNNh2A==", "bundleDependencies": [ "lodash" ], diff --git a/package.json b/package.json index 27b05576..906917e8 100644 --- a/package.json +++ b/package.json @@ -43,13 +43,13 @@ "test": "npm run lint && npm run test:unit" }, "dependencies": { - "@lando/nginx": "^1.3.0", + "@lando/nginx": "^1.4.1", "lodash": "^4.17.21", - "semver": "^7.3.7" + "semver": "^7.6.3" }, "devDependencies": { - "@babel/eslint-parser": "^7.16.0", - "@lando/leia": "0.6.5", + "@babel/eslint-parser": "^7.25.9", + "@lando/leia": "0.6.7", "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24", "chai": "^4.3.4", "command-line-test": "^1.0.10", From ec8644edb47373959ac03f7e1323d2eb62e172f7 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 2 Dec 2024 22:04:04 -0600 Subject: [PATCH 3/4] stdout versions during tests --- examples/8.1/README.md | 10 +++++----- examples/8.2/README.md | 10 +++++----- examples/8.3/README.md | 10 +++++----- examples/8.4/README.md | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/8.1/README.md b/examples/8.1/README.md index 5a5f3e0d..e231a827 100644 --- a/examples/8.1/README.md +++ b/examples/8.1/README.md @@ -22,13 +22,13 @@ Run the following commands to validate things are rolling as they should. ```bash # Should use 8.1 as the default php version -lando exec defaults -- php -v | grep "PHP 8.1" +lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.1" # Should use 13.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "13." # Should use apache 2.4 as the default webserver version -lando exec defaults -- apachectl -V | grep "2.4." +lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." # Should only serve over http by default lando exec defaults -- curl https://localhost || echo $? | grep 7 @@ -57,7 +57,7 @@ lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_INFO lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_TRANSLATED # Should use specified php version if given -lando exec custom -- php -v | grep "PHP 8.1" +lando exec custom -- php -v | tee >(cat 1>&2) | grep "PHP 8.1" # Should install composer 2.1.12 if version number is set lando exec custom -- composer --version --no-ansi | grep "Composer version 2.1.12" @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | grep v14. +lando node -v | tee >(cat 1>&2) | grep v14. ``` ## Destroy tests diff --git a/examples/8.2/README.md b/examples/8.2/README.md index d78fa99b..d95f489c 100644 --- a/examples/8.2/README.md +++ b/examples/8.2/README.md @@ -22,13 +22,13 @@ Run the following commands to validate things are rolling as they should. ```bash # Should use 8.2 as the default php version -lando exec defaults -- php -v | grep "PHP 8.2" +lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.2" # Should use 13.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "13." # Should use apache 2.4 as the default webserver version -lando exec defaults -- apachectl -V | grep "2.4." +lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." # Should only serve over http by default lando exec defaults -- curl https://localhost || echo $? | grep 7 @@ -57,7 +57,7 @@ lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_INFO lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_TRANSLATED # Should use specified php version if given -lando exec custom -- php -v | grep "PHP 8.2" +lando exec custom -- php -v | tee >(cat 1>&2) | grep "PHP 8.2" # Should install composer 2.2.18 if version number is set lando exec custom -- composer --version --no-ansi | grep "Composer version 2.2.18" @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | grep v14. +lando node -v | tee >(cat 1>&2) | grep v14. ``` ## Destroy tests diff --git a/examples/8.3/README.md b/examples/8.3/README.md index fc1ce3c2..6d39a208 100644 --- a/examples/8.3/README.md +++ b/examples/8.3/README.md @@ -22,13 +22,13 @@ Run the following commands to validate things are rolling as they should. ```bash # Should use 8.3 as the default php version -lando exec defaults -- php -v | grep "PHP 8.3" +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 | grep "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "13." # Should use apache 2.4 as the default webserver version -lando exec defaults -- apachectl -V | grep "2.4." +lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." # Should only serve over http by default lando exec defaults -- curl https://localhost || echo $? | grep 7 @@ -57,7 +57,7 @@ lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_INFO lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_TRANSLATED # Should use specified php version if given -lando exec custom -- php -v | grep "PHP 8.3" +lando exec custom -- php -v | tee >(cat 1>&2) | grep "PHP 8.3" # Should install composer 2.5.6 if version number is set lando exec custom -- composer --version --no-ansi | grep "Composer version 2.5.6" @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | grep v14. +lando node -v | tee >(cat 1>&2) | grep v14. ``` ## Destroy tests diff --git a/examples/8.4/README.md b/examples/8.4/README.md index ac252aec..d63eb7fb 100644 --- a/examples/8.4/README.md +++ b/examples/8.4/README.md @@ -22,13 +22,13 @@ Run the following commands to validate things are rolling as they should. ```bash # Should use 8.4 as the default php version -lando exec defaults -- php -v | grep "PHP 8.4" +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 | grep "15." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15." # Should use apache 2.4 as the default webserver version -lando exec defaults -- apachectl -V | grep "2.4." +lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." # Should only serve over http by default lando exec defaults -- curl https://localhost || echo $? | grep 7 @@ -57,7 +57,7 @@ lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_INFO lando exec custom_nginx -- curl https://localhost | grep SERVER | grep PATH_TRANSLATED # Should use specified php version if given -lando exec custom -- php -v | grep "PHP 8.4" +lando exec custom -- php -v | tee >(cat 1>&2) | grep "PHP 8.4" # Should install composer 2.5.6 if version number is set lando exec custom -- composer --version --no-ansi | grep "Composer version 2.5.6" @@ -111,7 +111,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node 18 installed in cli service -lando node -v | grep v18. +lando node -v | tee >(cat 1>&2) | grep v18. ``` ## Destroy tests From fea656e390291989dcabe6c095b0f8886670db3d Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 2 Dec 2024 22:12:56 -0600 Subject: [PATCH 4/4] test for newer versions --- examples/8.1/README.md | 4 ++-- examples/8.2/README.md | 4 ++-- examples/8.3/README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/8.1/README.md b/examples/8.1/README.md index e231a827..b6fc7dd9 100644 --- a/examples/8.1/README.md +++ b/examples/8.1/README.md @@ -25,7 +25,7 @@ Run the following commands to validate things are rolling as they should. lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.1" # Should use 13.x as the default postgresql-client version -lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | tee >(cat 1>&2) | grep v14. +lando node -v | tee >(cat 1>&2) | grep v18. ``` ## Destroy tests diff --git a/examples/8.2/README.md b/examples/8.2/README.md index d95f489c..5e1866cc 100644 --- a/examples/8.2/README.md +++ b/examples/8.2/README.md @@ -25,7 +25,7 @@ Run the following commands to validate things are rolling as they should. lando exec defaults -- php -v | tee >(cat 1>&2) | grep "PHP 8.2" # Should use 13.x as the default postgresql-client version -lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | tee >(cat 1>&2) | grep v14. +lando node -v | tee >(cat 1>&2) | grep v18. ``` ## Destroy tests diff --git a/examples/8.3/README.md b/examples/8.3/README.md index 6d39a208..20930a7c 100644 --- a/examples/8.3/README.md +++ b/examples/8.3/README.md @@ -25,7 +25,7 @@ Run the following commands to validate things are rolling as they should. 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 "13." +lando exec defaults -- psql -V | tee >(cat 1>&2) | grep "15." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | tee >(cat 1>&2) | grep "2.4." @@ -114,7 +114,7 @@ lando info -s cliworker --deep | grep Cmd | grep sleep | grep infinity lando exec cliworker -- composer --version --no-ansi | grep "Composer version 2." # Should have node14 installed in cli service -lando node -v | tee >(cat 1>&2) | grep v14. +lando node -v | tee >(cat 1>&2) | grep v18. ``` ## Destroy tests