diff --git a/src/php/README.md b/src/php/README.md index 683e9691f..297d6d95b 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -9,7 +9,7 @@ | *Categories* | Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/php | -| *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)) | +| *Available image variants* | 8 / 8-trixie, 8.4 / 8.4-trixie, 8.3 / 8.3-trixie, 8-bookworm, 8.4-bookworm, 8.3-bookworm, 8-bullseye, 8.4-bullseye,,8.3-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) | | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | @@ -25,15 +25,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag - `mcr.microsoft.com/devcontainers/php:8` (or `8-trixie`, `8-bookworm`, `8-bullseye` to pin to an OS version) - `mcr.microsoft.com/devcontainers/php:8.4` (or `8.4-trixie`, `8.4-bookworm`, `8.4-bullseye` to pin to an OS version) - `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-trixie`, `8.3-bookworm`, `8.3-bullseye` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-trixie`, `8.2-bookworm`, `8.2-bullseye` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example: - `mcr.microsoft.com/devcontainers/php:2-8` (or `2-8-bookworm`, `2-8-bullseye`) -- `mcr.microsoft.com/devcontainers/php:2.0-8` (or `2.0-8-bookworm`, `2.0-8-bullseye`) -- `mcr.microsoft.com/devcontainers/php:2.0.0-8` (or `2.0.0-8-bookworm`, `2.0.0-8-bullseye`) +- `mcr.microsoft.com/devcontainers/php:2.1-8` (or `2.1-8-bookworm`, `2.1-8-bullseye`) +- `mcr.microsoft.com/devcontainers/php:2.1.0-8` (or `2.1.0-8-bookworm`, `2.1.0-8-bullseye`) 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. diff --git a/src/php/manifest.json b/src/php/manifest.json index a3092578e..912f4a5e8 100644 --- a/src/php/manifest.json +++ b/src/php/manifest.json @@ -1,15 +1,12 @@ { - "version": "2.0.2", + "version": "2.1.0", "variants": [ "8.4-apache-trixie", "8.3-apache-trixie", - "8.2-apache-trixie", "8.4-apache-bookworm", "8.3-apache-bookworm", - "8.2-apache-bookworm", "8.4-apache-bullseye", - "8.3-apache-bullseye", - "8.2-apache-bullseye" + "8.3-apache-bullseye" ], "build": { "latest": "8.4-apache-trixie", @@ -22,10 +19,6 @@ "8.3-apache-trixie": [ "linux/amd64", "linux/arm64" - ], - "8.2-apache-trixie": [ - "linux/amd64", - "linux/arm64" ], "8.4-apache-bookworm": [ "linux/amd64", @@ -35,10 +28,6 @@ "linux/amd64", "linux/arm64" ], - "8.2-apache-bookworm": [ - "linux/amd64", - "linux/arm64" - ], "8.4-apache-bullseye": [ "linux/amd64", "linux/arm64" @@ -46,10 +35,6 @@ "8.3-apache-bullseye": [ "linux/amd64", "linux/arm64" - ], - "8.2-apache-bullseye": [ - "linux/amd64", - "linux/arm64" ] }, "tags": [ @@ -67,10 +52,6 @@ "php:${VERSION}-8.3", "php:${VERSION}-8.3-trixie" ], - "8.2-apache-trixie": [ - "php:${VERSION}-8.2", - "php:${VERSION}-8.2-trixie" - ], "8.4-apache-bookworm": [ "php:${VERSION}-8-bookworm", "php:${VERSION}-8.4-bookworm", @@ -78,9 +59,6 @@ ], "8.3-apache-bookworm": [ "php:${VERSION}-8.3-bookworm" - ], - "8.2-apache-bookworm": [ - "php:${VERSION}-8.2-bookworm" ], "8.4-apache-bullseye": [ "php:${VERSION}-8-bullseye", @@ -89,9 +67,6 @@ ], "8.3-apache-bullseye": [ "php:${VERSION}-8.3-bullseye" - ], - "8.2-apache-bullseye": [ - "php:${VERSION}-8.2-bullseye" ] } },