Skip to content

Commit 6a427f2

Browse files
authored
update php 8.x images to bookworm (#141)
* update php 8.x images to bookworm * ci bumps * get images in first * update docs links * Don't forget imagick
1 parent 59d3f9d commit 6a427f2

File tree

33 files changed

+362
-512
lines changed

33 files changed

+362
-512
lines changed

.github/workflows/build-php-images.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,70 +17,70 @@ jobs:
1717
matrix:
1818
include:
1919
- image: php
20-
tag: 8.4-fpm-4
20+
tag: 8.4-fpm-5
2121
context: images/8.4-fpm
2222
- image: php
23-
tag: 8.4-apache-4
23+
tag: 8.4-apache-5
2424
context: images/8.4-apache
2525
- image: php
26-
tag: 8.3-fpm-4
26+
tag: 8.3-fpm-5
2727
context: images/8.3-fpm
2828
- image: php
29-
tag: 8.3-apache-4
29+
tag: 8.3-apache-5
3030
context: images/8.3-apache
3131
- image: php
32-
tag: 8.2-fpm-4
32+
tag: 8.2-fpm-5
3333
context: images/8.2-fpm
3434
- image: php
35-
tag: 8.2-apache-4
35+
tag: 8.2-apache-5
3636
context: images/8.2-apache
3737
- image: php
38-
tag: 8.1-fpm-4
38+
tag: 8.1-fpm-5
3939
context: images/8.1-fpm
4040
- image: php
41-
tag: 8.1-apache-4
41+
tag: 8.1-apache-5
4242
context: images/8.1-apache
4343
- image: php
44-
tag: 8.0-fpm-4
44+
tag: 8.0-fpm-5
4545
context: images/8.0-fpm
4646
- image: php
47-
tag: 8.0-apache-4
47+
tag: 8.0-apache-5
4848
context: images/8.0-apache
4949
- image: php
50-
tag: 7.4-fpm-4
50+
tag: 7.4-fpm-5
5151
context: images/7.4-fpm
5252
- image: php
53-
tag: 7.4-apache-4
53+
tag: 7.4-apache-5
5454
context: images/7.4-apache
5555
- image: php
56-
tag: 7.3-fpm-4
56+
tag: 7.3-fpm-5
5757
context: images/7.3-fpm
5858
- image: php
59-
tag: 7.3-apache-4
59+
tag: 7.3-apache-5
6060
context: images/7.3-apache
6161
- image: php
62-
tag: 7.2-fpm-4
62+
tag: 7.2-fpm-5
6363
context: images/7.2-fpm
6464
- image: php
65-
tag: 7.2-apache-4
65+
tag: 7.2-apache-5
6666
context: images/7.2-apache
6767
- image: php
68-
tag: 7.1-fpm-4
68+
tag: 7.1-fpm-5
6969
context: images/7.1-fpm
7070
- image: php
71-
tag: 7.1-apache-4
71+
tag: 7.1-apache-5
7272
context: images/7.1-apache
7373
- image: php
74-
tag: 7.0-fpm-4
74+
tag: 7.0-fpm-5
7575
context: images/7.0-fpm
7676
- image: php
77-
tag: 7.0-apache-4
77+
tag: 7.0-apache-5
7878
context: images/7.0-apache
7979
- image: php
80-
tag: 5.6-fpm-4
80+
tag: 5.6-fpm-5
8181
context: images/5.6-fpm
8282
- image: php
83-
tag: 5.6-apache-4
83+
tag: 5.6-apache-5
8484
context: images/5.6-apache
8585

8686
steps:

.github/workflows/pr-docs-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-24.04
1313
node-version:
14-
- '18'
14+
- '20'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code

.github/workflows/pr-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-24.04
1313
node-version:
14-
- '18'
14+
- '20'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code

.github/workflows/pr-php-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
os:
3333
- ubuntu-24.04
3434
node-version:
35-
- '18'
35+
- '20'
3636
steps:
3737
- name: Checkout code
3838
uses: actions/checkout@v4

.github/workflows/pr-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- ubuntu-24.04
1414
- macos-12
1515
node-version:
16-
- '18'
16+
- '20'
1717
steps:
1818
# Install deps and cache
1919
- name: Checkout code

docs/caveats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ Lando will set the `PATH` hierarchy for this service as follows:
2525
]
2626
```
2727
28-
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.
28+
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.

docs/config.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ description: Learn how to configure the Lando PHP service.
55

66
# Configuration
77

8-
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.
8+
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.
99

10-
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:
10+
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:
1111

1212
```yaml
1313
services:
@@ -193,9 +193,9 @@ composer_version: snapshot
193193
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.
194194

195195
::: tip Use composer.json if you can
196-
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.
196+
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.
197197

198-
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).
198+
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).
199199
:::
200200

201201
An example of globally installing `phpunit/phpunit` `^6.5` is shown below:
@@ -208,7 +208,7 @@ services:
208208
phpunit/phpunit: ^6.5
209209
```
210210

211-
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:
211+
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:
212212

213213
```yaml
214214
services:
@@ -273,7 +273,7 @@ lando php
273273
lando composer
274274
```
275275

276-
Lando tooling is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/core/v3/tooling.html) of its cool features.
276+
Lando tooling is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/landofile/tooling.html) of its cool features.
277277

278278
## Adding routing
279279

@@ -286,4 +286,4 @@ proxy:
286286
- something.else.local
287287
```
288288

289-
Lando proxying is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/core/v3/proxy.html) of its cool features.
289+
Lando proxying is actually pretty powerful so definitely check out [the rest](https://docs.lando.dev/landofile/proxy.html) of its cool features.

docs/extensions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ Note that imagick is temporarily unavailable on PHP 8.3/8.4, due to a pending is
7575

7676
There are a few ways you can extend or modify our php images below:
7777

78-
* Using [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps).
79-
* Using your own image with [service overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides).
80-
* Building from your own local Dockerfile [service overrides](https://docs.lando.dev/core/v3/services/lando.html#using-dockerfiles).
78+
* Using [build steps](https://docs.lando.dev/services/lando-3.html#build-steps).
79+
* Using your own image with [service overrides](https://docs.lando.dev/services/lando-3.html#overrides).
80+
* Building from your own local Dockerfile [service overrides](https://docs.lando.dev/services/lando-3.html#using-dockerfiles).
8181

82-
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:
82+
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:
8383

8484
```yaml
8585
services:

docs/guides/installing-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Also note that you may need to adapt these slightly depending on the PHP version
2727

2828
## 1. Using build steps
2929

30-
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)
30+
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)
3131

3232
Here is an example that uses build-steps to install the `xsl` and `stats` extensions.
3333

docs/guides/installing-node.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ We've found installing `node` inside a Lando PHP service to generally be the pat
2525

2626
## 1. Using build steps
2727

28-
Below is an example that installs `node12` using [build-steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps).
28+
Below is an example that installs `node12` using [build-steps](https://docs.lando.dev/services/lando-3.html#build-steps).
2929

3030
```yaml
3131
services:
@@ -52,7 +52,7 @@ lando npm -v
5252

5353
## 2. Extending a Dockerfile
5454

55-
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:
55+
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:
5656

5757
**.lando.yml**
5858

docs/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ next: ./config.html
88

99
[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/).
1010

11-
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).
11+
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).
1212

1313
```yaml
1414
services:
@@ -27,7 +27,7 @@ services:
2727
* [8.0](https://hub.docker.com/r/devwithlando/php)
2828
* **[7.4](https://hub.docker.com/r/devwithlando/php)** **(default)**
2929
* [7.3](https://hub.docker.com/r/devwithlando/php)
30-
* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides)
30+
* [custom](https://docs.lando.dev/services/lando-3.html#overrides)
3131
3232
## Legacy versions
3333
@@ -49,5 +49,5 @@ You can still run these versions with Lando but for all intents and purposes the
4949
5050
Because we use our own custom images for `php`, specifying a patch version is not currently supported.
5151

52-
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).
52+
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).
5353

images/5.6-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:5.6-apache-4 .
1+
# docker build -t devwithlando/php:5.6-apache-5 .
22

33
FROM php:5.6-apache-stretch
44

images/5.6-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:5.6-fpm-4 .
1+
# docker build -t devwithlando/php:5.6-fpm-5 .
22

33
FROM php:5.6-fpm-stretch
44

images/7.0-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.0-apache-4 .
1+
# docker build -t devwithlando/php:7.0-apache-5 .
22

33
FROM php:7.0-apache-stretch
44

images/7.0-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.0-fpm-4 .
1+
# docker build -t devwithlando/php:7.0-fpm-5 .
22

33
FROM php:7.0-fpm-stretch
44

images/7.1-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.1-apache-4 .
1+
# docker build -t devwithlando/php:7.1-apache-5 .
22

33
FROM php:7.1-apache-buster
44

images/7.1-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.1-fpm-4 .
1+
# docker build -t devwithlando/php:7.1-fpm-5 .
22

33
FROM php:7.1-fpm-buster
44

images/7.2-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.2-apache-4 .
1+
# docker build -t devwithlando/php:7.2-apache-5 .
22

33
FROM php:7.2-apache-buster
44

images/7.2-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.2-fpm-4 .
1+
# docker build -t devwithlando/php:7.2-fpm-5 .
22

33
FROM php:7.2-fpm-buster
44

images/7.3-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.3-apache-4 .
1+
# docker build -t devwithlando/php:7.3-apache-5 .
22

33
FROM php:7.3-apache-bullseye
44

images/7.3-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.3-fpm-4 .
1+
# docker build -t devwithlando/php:7.3-fpm-5 .
22

33
FROM php:7.3-fpm-bullseye
44

images/7.4-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.4-apache-4 .
1+
# docker build -t devwithlando/php:7.4-apache-5 .
22

33
FROM php:7.4-apache-bullseye
44

images/7.4-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:7.4-fpm-4 .
1+
# docker build -t devwithlando/php:7.4-fpm-5 .
22

33
FROM php:7.4-fpm-bullseye
44

images/8.0-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:8.0-apache-4 .
1+
# docker build -t devwithlando/php:8.0-apache-5 .
22

33
FROM php:8.0-apache-bullseye
44

images/8.0-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t devwithlando/php:8.0-fpm-4 .
1+
# docker build -t devwithlando/php:8.0-fpm-5 .
22

33
FROM php:8.0-fpm-bullseye
44

0 commit comments

Comments
 (0)