Skip to content

Commit 7d96164

Browse files
committed
Add PHP 8.5 support
1 parent 355c1ac commit 7d96164

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+342
-11
lines changed

.github/workflows/workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php_version: ['8.4', '8.3','8.2','8.1']
19+
php_version: ['8.5', '8.4', '8.3','8.2','8.1']
2020
variant: ['apache','cli','fpm']
2121
# builder: [ {arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "macos-latest"}]
2222
builder: [ {arch: "amd64", os: "ubuntu-24.04"}, {arch: "arm64", os: "ubuntu-24.04"}]
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
fail-fast: false
6767
matrix:
68-
php_version: ['8.4', '8.3','8.2','8.1']
68+
php_version: ['8.5', '8.4', '8.3','8.2','8.1']
6969
variant: ['apache','cli','fpm']
7070
steps:
7171
- name: Checkout

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log
22
## Version 5
33

4+
### Minor changes
5+
6+
* **2025-11-26**
7+
* Support for PHP 8.5
8+
9+
### Initial
10+
411
**2025-01-27**
512
* Upgrade the base version from Ubuntu 20.04 to 24.04
613
* Default blackfire version is now the version 2 (v1 is still available with BLACKFIRE_VERSION=1 at buildtime but with securities issues)

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ blueprint: ## Generate all blueprints file
44
@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
55
orbit run generate
66

7-
test-latest: test-8.4 ## Test the latest build only
7+
test-latest: test-8.5 ## Test the latest build only
88

99
_test-prerequisites: blueprint
1010
docker pull ubuntu:20.04
@@ -18,10 +18,11 @@ test-legacy-quick: ## Test 7.4, 8.0 and 8.1 quickly
1818
VERSION=7.4 VARIANT=cli $(MAKE) _test-version-quick
1919
VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick
2020
VERSION=8.1 VARIANT=cli $(MAKE) _test-version-quick
21-
test-quick: ## Test 8.2, 8.3 and 8.4 quickly
21+
test-quick: ## Test 8.2, 8.3, 8.4 and 8.5 quickly
2222
VERSION=8.2 VARIANT=cli $(MAKE) _test-version-quick
2323
VERSION=8.3 VARIANT=cli $(MAKE) _test-version-quick
2424
VERSION=8.4 VARIANT=cli $(MAKE) _test-version-quick
25+
VERSION=8.5 VARIANT=cli $(MAKE) _test-version-quick
2526

2627
test-8.3: ## Test php8.3 build only
2728
VERSION=8.3 VARIANT=cli $(MAKE) _test-version
@@ -38,6 +39,11 @@ test-8.1: ## Test php8.1 build only
3839
VERSION=8.1 VARIANT=apache $(MAKE) _test-version
3940
VERSION=8.1 VARIANT=fpm $(MAKE) _test-version
4041

42+
test-8.5: ## Test php8.5 build only
43+
VERSION=8.5 VARIANT=cli $(MAKE) _test-version
44+
VERSION=8.5 VARIANT=apache $(MAKE) _test-version
45+
VERSION=8.5 VARIANT=fpm $(MAKE) _test-version
46+
4147
test-8.4: ## Test php8.4 build only
4248
VERSION=8.4 VARIANT=cli $(MAKE) _test-version
4349
VERSION=8.4 VARIANT=apache $(MAKE) _test-version

README.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,23 @@ This repository contains a set of developer-friendly, general purpose PHP images
2020

2121

2222

23-
| Name | PHP version | type |variant | NodeJS version | Size
23+
| Name | PHP version | type |variant | NodeJS version | Size
2424
|-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|--------|-----------------|------
25+
| [thecodingmachine/php:8.5-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.5.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache)
26+
| [thecodingmachine/php:8.5-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node20)
27+
| [thecodingmachine/php:8.5-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node22)
28+
| [thecodingmachine/php:8.5-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node24)
29+
| [thecodingmachine/php:8.5-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.5.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm)
30+
| [thecodingmachine/php:8.5-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node20)
31+
| [thecodingmachine/php:8.5-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node22)
32+
| [thecodingmachine/php:8.5-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node24)
33+
| [thecodingmachine/php:8.5-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.5.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli)
34+
| [thecodingmachine/php:8.5-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node20)
35+
| [thecodingmachine/php:8.5-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node22)
36+
| [thecodingmachine/php:8.5-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node24)
37+
| [thecodingmachine/php:8.5-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.5.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-apache)
38+
| [thecodingmachine/php:8.5-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.5.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-fpm)
39+
| [thecodingmachine/php:8.5-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.5.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-cli)
2540
| [thecodingmachine/php:8.4-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.4.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache)
2641
| [thecodingmachine/php:8.4-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node20)
2742
| [thecodingmachine/php:8.4-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node22)

docker-bake.hcl

Lines changed: 257 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
group "default" {
44
targets = [
5-
5+
6+
"php85",
67
"php84",
78
"php83",
89
"php82",
@@ -12,6 +13,27 @@ group "default" {
1213
]
1314
}
1415

16+
group "php85-apache-all" {
17+
targets = [
18+
"php85-slim-apache",
19+
"php85-apache",
20+
"php85-apache-node24","php85-apache-node22","php85-apache-node20",
21+
]
22+
}
23+
group "php85-fpm-all" {
24+
targets = [
25+
"php85-slim-fpm",
26+
"php85-fpm",
27+
"php85-fpm-node24","php85-fpm-node22","php85-fpm-node20",
28+
]
29+
}
30+
group "php85-cli-all" {
31+
targets = [
32+
"php85-slim-cli",
33+
"php85-cli",
34+
"php85-cli-node24","php85-cli-node22","php85-cli-node20",
35+
]
36+
}
1537
group "php84-apache-all" {
1638
targets = [
1739
"php84-slim-apache",
@@ -140,6 +162,9 @@ group "php74-cli-all" {
140162
}
141163

142164

165+
group "php85" {
166+
targets = ["php85-apache-all","php85-fpm-all","php85-cli-all",]
167+
}
143168
group "php84" {
144169
targets = ["php84-apache-all","php84-fpm-all","php84-cli-all",]
145170
}
@@ -186,6 +211,237 @@ target "default" {
186211
}
187212

188213

214+
###########################
215+
## PHP 8.5
216+
###########################
217+
# thecodingmachine/php:8.5-v5-slim-apache
218+
target "php85-slim-apache" {
219+
inherits = ["default"]
220+
tags = tag("8.5", "slim-apache")
221+
dockerfile = "Dockerfile.slim.apache"
222+
args = {
223+
PHP_VERSION = "8.5"
224+
VARIANT = "apache"
225+
}
226+
}
227+
228+
# thecodingmachine/php:8.5-v5-apache
229+
target "php85-apache" {
230+
inherits = ["default"]
231+
tags = tag("8.5", "apache")
232+
dockerfile = "Dockerfile.apache"
233+
args = {
234+
PHP_VERSION = "8.5"
235+
VARIANT = "apache"
236+
FROM_IMAGE = "slim"
237+
}
238+
contexts = {
239+
slim = "target:php85-slim-apache"
240+
}
241+
}
242+
243+
# thecodingmachine/php:8.5-v5-apache-node24
244+
target "php85-apache-node24" {
245+
inherits = ["default"]
246+
tags = tag("8.5", "apache-node24")
247+
dockerfile = "Dockerfile.apache.node"
248+
args = {
249+
PHP_VERSION = "8.5"
250+
VARIANT = "apache-node24"
251+
FROM_IMAGE = "fat"
252+
NODE_VERSION = "24"
253+
}
254+
contexts = {
255+
fat = "target:php85-apache"
256+
}
257+
}
258+
259+
# thecodingmachine/php:8.5-v5-apache-node22
260+
target "php85-apache-node22" {
261+
inherits = ["default"]
262+
tags = tag("8.5", "apache-node22")
263+
dockerfile = "Dockerfile.apache.node"
264+
args = {
265+
PHP_VERSION = "8.5"
266+
VARIANT = "apache-node22"
267+
FROM_IMAGE = "fat"
268+
NODE_VERSION = "22"
269+
}
270+
contexts = {
271+
fat = "target:php85-apache"
272+
}
273+
}
274+
275+
# thecodingmachine/php:8.5-v5-apache-node20
276+
target "php85-apache-node20" {
277+
inherits = ["default"]
278+
tags = tag("8.5", "apache-node20")
279+
dockerfile = "Dockerfile.apache.node"
280+
args = {
281+
PHP_VERSION = "8.5"
282+
VARIANT = "apache-node20"
283+
FROM_IMAGE = "fat"
284+
NODE_VERSION = "20"
285+
}
286+
contexts = {
287+
fat = "target:php85-apache"
288+
}
289+
}
290+
291+
###########################
292+
## PHP 8.5
293+
###########################
294+
# thecodingmachine/php:8.5-v5-slim-fpm
295+
target "php85-slim-fpm" {
296+
inherits = ["default"]
297+
tags = tag("8.5", "slim-fpm")
298+
dockerfile = "Dockerfile.slim.fpm"
299+
args = {
300+
PHP_VERSION = "8.5"
301+
VARIANT = "fpm"
302+
}
303+
}
304+
305+
# thecodingmachine/php:8.5-v5-fpm
306+
target "php85-fpm" {
307+
inherits = ["default"]
308+
tags = tag("8.5", "fpm")
309+
dockerfile = "Dockerfile.fpm"
310+
args = {
311+
PHP_VERSION = "8.5"
312+
VARIANT = "fpm"
313+
FROM_IMAGE = "slim"
314+
}
315+
contexts = {
316+
slim = "target:php85-slim-fpm"
317+
}
318+
}
319+
320+
# thecodingmachine/php:8.5-v5-fpm-node24
321+
target "php85-fpm-node24" {
322+
inherits = ["default"]
323+
tags = tag("8.5", "fpm-node24")
324+
dockerfile = "Dockerfile.fpm.node"
325+
args = {
326+
PHP_VERSION = "8.5"
327+
VARIANT = "fpm-node24"
328+
FROM_IMAGE = "fat"
329+
NODE_VERSION = "24"
330+
}
331+
contexts = {
332+
fat = "target:php85-fpm"
333+
}
334+
}
335+
336+
# thecodingmachine/php:8.5-v5-fpm-node22
337+
target "php85-fpm-node22" {
338+
inherits = ["default"]
339+
tags = tag("8.5", "fpm-node22")
340+
dockerfile = "Dockerfile.fpm.node"
341+
args = {
342+
PHP_VERSION = "8.5"
343+
VARIANT = "fpm-node22"
344+
FROM_IMAGE = "fat"
345+
NODE_VERSION = "22"
346+
}
347+
contexts = {
348+
fat = "target:php85-fpm"
349+
}
350+
}
351+
352+
# thecodingmachine/php:8.5-v5-fpm-node20
353+
target "php85-fpm-node20" {
354+
inherits = ["default"]
355+
tags = tag("8.5", "fpm-node20")
356+
dockerfile = "Dockerfile.fpm.node"
357+
args = {
358+
PHP_VERSION = "8.5"
359+
VARIANT = "fpm-node20"
360+
FROM_IMAGE = "fat"
361+
NODE_VERSION = "20"
362+
}
363+
contexts = {
364+
fat = "target:php85-fpm"
365+
}
366+
}
367+
368+
###########################
369+
## PHP 8.5
370+
###########################
371+
# thecodingmachine/php:8.5-v5-slim-cli
372+
target "php85-slim-cli" {
373+
inherits = ["default"]
374+
tags = tag("8.5", "slim-cli")
375+
dockerfile = "Dockerfile.slim.cli"
376+
args = {
377+
PHP_VERSION = "8.5"
378+
VARIANT = "cli"
379+
}
380+
}
381+
382+
# thecodingmachine/php:8.5-v5-cli
383+
target "php85-cli" {
384+
inherits = ["default"]
385+
tags = tag("8.5", "cli")
386+
dockerfile = "Dockerfile.cli"
387+
args = {
388+
PHP_VERSION = "8.5"
389+
VARIANT = "cli"
390+
FROM_IMAGE = "slim"
391+
}
392+
contexts = {
393+
slim = "target:php85-slim-cli"
394+
}
395+
}
396+
397+
# thecodingmachine/php:8.5-v5-cli-node24
398+
target "php85-cli-node24" {
399+
inherits = ["default"]
400+
tags = tag("8.5", "cli-node24")
401+
dockerfile = "Dockerfile.cli.node"
402+
args = {
403+
PHP_VERSION = "8.5"
404+
VARIANT = "cli-node24"
405+
FROM_IMAGE = "fat"
406+
NODE_VERSION = "24"
407+
}
408+
contexts = {
409+
fat = "target:php85-cli"
410+
}
411+
}
412+
413+
# thecodingmachine/php:8.5-v5-cli-node22
414+
target "php85-cli-node22" {
415+
inherits = ["default"]
416+
tags = tag("8.5", "cli-node22")
417+
dockerfile = "Dockerfile.cli.node"
418+
args = {
419+
PHP_VERSION = "8.5"
420+
VARIANT = "cli-node22"
421+
FROM_IMAGE = "fat"
422+
NODE_VERSION = "22"
423+
}
424+
contexts = {
425+
fat = "target:php85-cli"
426+
}
427+
}
428+
429+
# thecodingmachine/php:8.5-v5-cli-node20
430+
target "php85-cli-node20" {
431+
inherits = ["default"]
432+
tags = tag("8.5", "cli-node20")
433+
dockerfile = "Dockerfile.cli.node"
434+
args = {
435+
PHP_VERSION = "8.5"
436+
VARIANT = "cli-node20"
437+
FROM_IMAGE = "fat"
438+
NODE_VERSION = "20"
439+
}
440+
contexts = {
441+
fat = "target:php85-cli"
442+
}
443+
}
444+
189445
###########################
190446
## PHP 8.4
191447
###########################

extensions/8.5/amqp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../core/amqp

extensions/8.5/apcu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../core/apcu

extensions/8.5/ast

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../core/ast

extensions/8.5/bcmath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../core/bcmath

extensions/8.5/bz2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../core/bz2

0 commit comments

Comments
 (0)