Skip to content

Commit 5babcf5

Browse files
sireeshajonnalagaddaCopilot
sireeshajonnalagadda
and
Copilot
authored
Add Support for PHP 8.5 and remove support for bullseye (#1676)
* Add support for PHP 8.5 * Add support for PHP 8.5 * removing bullseye variant * Add support for php 8.5 * Add support for PHP 8.5 * Update xdebug installation comment to specify version 3.5.0 * Update PHP feature to use version 8.5.0 and change additional version to 8.4.15 * Update src/php/README.md Co-authored-by: Copilot <[email protected]> * Update src/php/README.md Co-authored-by: Copilot <[email protected]> * Update src/php/README.md Co-authored-by: Copilot <[email protected]> * Update src/php/README.md Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]>
1 parent bdf8420 commit 5babcf5

File tree

4 files changed

+43
-51
lines changed

4 files changed

+43
-51
lines changed

‎src/php/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG VARIANT=8.4-apache-trixie
1+
ARG VARIANT=8.5-apache-trixie
22
FROM php:${VARIANT}
33

4-
# Install xdebug
4+
# Install xdebug(3.5.0)
55
RUN yes | pecl install xdebug \
66
&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
77
&& echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
@@ -13,7 +13,6 @@ RUN yes | pecl install xdebug \
1313
RUN curl -sSL https://getcomposer.org/installer | php \
1414
&& chmod +x composer.phar \
1515
&& mv composer.phar /usr/local/bin/composer
16-
1716
# [Optional] Uncomment this section to install additional packages.
1817
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1918
# && apt-get -y install --no-install-recommends <your-package-list-here>

‎src/php/README.md‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/php |
12-
| *Available image variants* | 8 / 8-trixie, 8.4 / 8.4-trixie, 8.3 / 8.3-trixie, 8.2 / 8.2-trixie, 8-bookworm, 8.4-bookworm, 8.3-bookworm, 8.2-bookworm, 8-bullseye, 8.4-bullseye,,8.3-bullseye, 8.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
12+
| *Available image variants* | 8 / 8-trixie, 8.5 / 8.5-trixie, 8.4 / 8.4-trixie, 8.3 / 8.3-trixie, 8.2 / 8.2-trixie, 8-bookworm, 8.5-bookworm, 8.4-bookworm, 8.3-bookworm, 8.2-bookworm ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, and `bookworm` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
1616
| *Languages, platforms* | PHP |
@@ -22,20 +22,21 @@ See **[history](history)** for information on the contents of published images.
2222
You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` with one of the following:
2323

2424
- `mcr.microsoft.com/devcontainers/php` (latest)
25-
- `mcr.microsoft.com/devcontainers/php:8` (or `8-trixie`, `8-bookworm`, `8-bullseye` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/php:8.4` (or `8.4-trixie`, `8.4-bookworm`, `8.4-bullseye` to pin to an OS version)
27-
- `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-trixie`, `8.3-bookworm`, `8.3-bullseye` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-trixie`, `8.2-bookworm`, `8.2-bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/php:8` (or `8-trixie`, `8-bookworm` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/php:8.5` (or `8.5-trixie`, `8.5-bookworm` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/php:8.4` (or `8.4-trixie`, `8.4-bookworm` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-trixie`, `8.3-bookworm` to pin to an OS version)
29+
- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-trixie`, `8.2-bookworm` to pin to an OS version)
2930

3031
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3132

3233
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3334

34-
- `mcr.microsoft.com/devcontainers/php:2-8` (or `2-8-bookworm`, `2-8-bullseye`)
35-
- `mcr.microsoft.com/devcontainers/php:2.0-8` (or `2.0-8-bookworm`, `2.0-8-bullseye`)
36-
- `mcr.microsoft.com/devcontainers/php:2.0.0-8` (or `2.0.0-8-bookworm`, `2.0.0-8-bullseye`)
35+
- `mcr.microsoft.com/devcontainers/php:3-8` (or `3-8-trixie`, `3-8-bookworm` )
36+
- `mcr.microsoft.com/devcontainers/php:2.0-8` (or `3.0-8-trixie`, `3.0-8-bookworm` )
37+
- `mcr.microsoft.com/devcontainers/php:3.0.0-8` (or `3.0.0-8-trixie`, `3.0.0-8-bookworm` )
3738

38-
However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-8`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
39+
However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `3-8`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
3940

4041
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/php/tags/list).
4142

‎src/php/manifest.json‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
{
2-
"version": "2.0.4",
2+
"version": "3.0.0",
3+
34
"variants": [
5+
"8.5-apache-trixie",
46
"8.4-apache-trixie",
57
"8.3-apache-trixie",
68
"8.2-apache-trixie",
9+
"8.5-apache-bookworm",
710
"8.4-apache-bookworm",
811
"8.3-apache-bookworm",
9-
"8.2-apache-bookworm",
10-
"8.4-apache-bullseye",
11-
"8.3-apache-bullseye",
12-
"8.2-apache-bullseye"
12+
"8.2-apache-bookworm"
1313
],
1414
"build": {
15-
"latest": "8.4-apache-trixie",
15+
"latest": "8.5-apache-trixie",
1616
"rootDistro": "debian",
1717
"architectures": {
18+
"8.5-apache-trixie": [
19+
"linux/amd64",
20+
"linux/arm64"
21+
],
1822
"8.4-apache-trixie": [
1923
"linux/amd64",
2024
"linux/arm64"
@@ -26,72 +30,60 @@
2630
"8.2-apache-trixie": [
2731
"linux/amd64",
2832
"linux/arm64"
33+
],
34+
"8.5-apache-bookworm": [
35+
"linux/amd64",
36+
"linux/arm64"
2937
],
3038
"8.4-apache-bookworm": [
3139
"linux/amd64",
3240
"linux/arm64"
33-
],
41+
],
3442
"8.3-apache-bookworm": [
3543
"linux/amd64",
3644
"linux/arm64"
3745
],
3846
"8.2-apache-bookworm": [
3947
"linux/amd64",
4048
"linux/arm64"
41-
],
42-
"8.4-apache-bullseye": [
43-
"linux/amd64",
44-
"linux/arm64"
45-
],
46-
"8.3-apache-bullseye": [
47-
"linux/amd64",
48-
"linux/arm64"
49-
],
50-
"8.2-apache-bullseye": [
51-
"linux/amd64",
52-
"linux/arm64"
5349
]
5450
},
5551
"tags": [
5652
"php:${VERSION}-${VARIANT}"
5753
],
5854
"variantTags": {
59-
"8.4-apache-trixie": [
55+
"8.5-apache-trixie": [
6056
"php:${VERSION}-8",
61-
"php:${VERSION}-8.4",
57+
"php:${VERSION}-8.5",
6258
"php:${VERSION}-8-trixie",
63-
"php:${VERSION}-8.4-trixie",
59+
"php:${VERSION}-8.5-trixie",
6460
"php:${VERSION}-trixie"
6561
],
62+
"8.4-apache-trixie": [
63+
"php:${VERSION}-8.4",
64+
"php:${VERSION}-8.4-trixie"
65+
],
6666
"8.3-apache-trixie": [
6767
"php:${VERSION}-8.3",
6868
"php:${VERSION}-8.3-trixie"
6969
],
7070
"8.2-apache-trixie": [
7171
"php:${VERSION}-8.2",
7272
"php:${VERSION}-8.2-trixie"
73-
],
74-
"8.4-apache-bookworm": [
73+
],
74+
"8.5-apache-bookworm": [
7575
"php:${VERSION}-8-bookworm",
76-
"php:${VERSION}-8.4-bookworm",
76+
"php:${VERSION}-8.5-bookworm",
7777
"php:${VERSION}-bookworm"
78+
],
79+
"8.4-apache-bookworm": [
80+
"php:${VERSION}-8.4-bookworm"
7881
],
7982
"8.3-apache-bookworm": [
8083
"php:${VERSION}-8.3-bookworm"
8184
],
8285
"8.2-apache-bookworm": [
8386
"php:${VERSION}-8.2-bookworm"
84-
],
85-
"8.4-apache-bullseye": [
86-
"php:${VERSION}-8-bullseye",
87-
"php:${VERSION}-8.4-bullseye",
88-
"php:${VERSION}-bullseye"
89-
],
90-
"8.3-apache-bullseye": [
91-
"php:${VERSION}-8.3-bullseye"
92-
],
93-
"8.2-apache-bullseye": [
94-
"php:${VERSION}-8.2-bullseye"
9587
]
9688
}
9789
},

‎src/universal/.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"useOryxIfAvailable": "false"
3131
},
3232
"ghcr.io/devcontainers/features/php:1": {
33-
"version": "8.4.8",
34-
"additionalVersions": "8.3.14",
33+
"version": "8.5.0",
34+
"additionalVersions": "8.4.15",
3535
"installComposer": "true"
3636
},
3737
"ghcr.io/devcontainers/features/conda:1": {

0 commit comments

Comments
 (0)