Skip to content

Commit f3a70be

Browse files
Support PHP 8.3 in php and universal images (#864)
* Support PHP 8.3 * Update universal image with php 8.3
1 parent bb45d9c commit f3a70be

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

src/php/.devcontainer/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8-apache-bookworm, 8.2-apache-bookworm, 8.1-apache-bookworm, 8-apache-bullseye, 8.2-apache-bullseye, 8.1-apache-bullseye, 8.0-apache-bullseye, 8-apache-buster, 8.2-apache-buster, 8.1-apache-buster, 8.0-apache-buster
2-
ARG VARIANT=8.2-apache-bookworm
1+
ARG VARIANT=8.3-apache-bookworm
32
FROM php:${VARIANT}
43

54
# Install xdebug

src/php/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/php |
12-
| *Available image variants* | 8 / 8-bookworm, 8.2 / 8.2-bookworm, 8.1 / 8.1-bookworm, 8.0 / 8.0-bookworm, 8-bullseye, 8.2-bullseye, 8.1-bullseye, 8.0-bullseye, 8-buster, 8.2-buster, 8.1-buster, 8.0-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
12+
| *Available image variants* | 8 / 8-bookworm, 8.3 / 8.3-bookworm, 8.2 / 8.2-bookworm, 8.1 / 8.1-bookworm, 8.0 / 8.0-bookworm, 8-bullseye, 8.3-bullseye, 8.2-bullseye, 8.1-bullseye, 8.0-bullseye, 8-buster, 8.2-buster, 8.1-buster, 8.0-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -23,6 +23,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2323

2424
- `mcr.microsoft.com/devcontainers/php` (latest)
2525
- `mcr.microsoft.com/devcontainers/php:8` (or `8-bookworm`, `8-bullseye`, `8-buster` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-bookworm`, `8.3-bullseye` to pin to an OS version)
2627
- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-bookworm`, `8.2-bullseye`, `8.2-buster` to pin to an OS version)
2728
- `mcr.microsoft.com/devcontainers/php:8.1` (or `8.1-bookworm`, `8.1-bullseye`, `8.1-buster` to pin to an OS version)
2829
- `mcr.microsoft.com/devcontainers/php:8.0` (or `8.0-bullseye`, `8.0-buster` to pin to an OS version)

src/php/manifest.json

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"version": "1.0.5",
33
"variants": [
4+
"8.3-apache-bookworm",
45
"8.2-apache-bookworm",
56
"8.1-apache-bookworm",
7+
"8.3-apache-bullseye",
68
"8.2-apache-bullseye",
79
"8.1-apache-bullseye",
810
"8.0-apache-bullseye",
@@ -11,9 +13,13 @@
1113
"8.0-apache-buster"
1214
],
1315
"build": {
14-
"latest": "8.2-apache-bookworm",
16+
"latest": "8.3-apache-bookworm",
1517
"rootDistro": "debian",
1618
"architectures": {
19+
"8.3-apache-bookworm": [
20+
"linux/amd64",
21+
"linux/arm64"
22+
],
1723
"8.2-apache-bookworm": [
1824
"linux/amd64",
1925
"linux/arm64"
@@ -22,6 +28,10 @@
2228
"linux/amd64",
2329
"linux/arm64"
2430
],
31+
"8.3-apache-bullseye": [
32+
"linux/amd64",
33+
"linux/arm64"
34+
],
2535
"8.2-apache-bullseye": [
2636
"linux/amd64",
2737
"linux/arm64"
@@ -48,22 +58,29 @@
4858
"php:${VERSION}-${VARIANT}"
4959
],
5060
"variantTags": {
51-
"8.2-apache-bookworm": [
61+
"8.3-apache-bookworm": [
5262
"php:${VERSION}-8",
53-
"php:${VERSION}-8.2",
63+
"php:${VERSION}-8.3",
5464
"php:${VERSION}-8-bookworm",
55-
"php:${VERSION}-8.2-bookworm",
65+
"php:${VERSION}-8.3-bookworm",
5666
"php:${VERSION}-bookworm"
5767
],
68+
"8.2-apache-bookworm": [
69+
"php:${VERSION}-8.2",
70+
"php:${VERSION}-8.2-bookworm"
71+
],
5872
"8.1-apache-bookworm": [
5973
"php:${VERSION}-8.1",
6074
"php:${VERSION}-8.1-bookworm"
6175
],
62-
"8.2-apache-bullseye": [
76+
"8.3-apache-bullseye": [
6377
"php:${VERSION}-8-bullseye",
64-
"php:${VERSION}-8.2-bullseye",
78+
"php:${VERSION}-8.3-bullseye",
6579
"php:${VERSION}-bullseye"
6680
],
81+
"8.2-apache-bullseye": [
82+
"php:${VERSION}-8.2-bullseye"
83+
],
6784
"8.1-apache-bullseye": [
6885
"php:${VERSION}-8.1-bullseye"
6986
],

src/universal/.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"./local-features/machine-learning-packages": "latest",
3333
"ghcr.io/devcontainers/features/php:1": {
34-
"version": "8.2.1",
35-
"additionalVersions": "8.1.14",
34+
"version": "8.3.0",
35+
"additionalVersions": "8.2.13",
3636
"installComposer": "true"
3737
},
3838
"ghcr.io/devcontainers/features/conda:1": {

0 commit comments

Comments
 (0)