diff --git a/src/php/.devcontainer/Dockerfile b/src/php/.devcontainer/Dockerfile index 827b63d7ea..785c026e60 100644 --- a/src/php/.devcontainer/Dockerfile +++ b/src/php/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT=8.4-apache-trixie +ARG VARIANT=8.5-apache-trixie FROM php:${VARIANT} # Install xdebug @@ -13,7 +13,6 @@ RUN yes | pecl install xdebug \ RUN curl -sSL https://getcomposer.org/installer | php \ && chmod +x composer.phar \ && mv composer.phar /usr/local/bin/composer - # [Optional] Uncomment this section to install additional packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # && apt-get -y install --no-install-recommends diff --git a/src/php/README.md b/src/php/README.md index 683e9691f7..e065d3ef4f 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -9,8 +9,8 @@ | *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)) | -| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants | +| *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)) | +| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, and `bookworm` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | | *Languages, platforms* | PHP | @@ -22,20 +22,21 @@ See **[history](history)** for information on the contents of published images. 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: - `mcr.microsoft.com/devcontainers/php` (latest) -- `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) +- `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.5` (or `8.5-trixie`, `8.5-bookworm` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/php:8.4` (or `8.4-trixie`, `8.4-bookworm` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-trixie`, `8.3-bookworm` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-trixie`, `8.2-bookworm` 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:3-8` (or `3-8-trixie`, `3-8-bookworm` ) +- `mcr.microsoft.com/devcontainers/php:2.0-8` (or `3.0-8-trixie`,`3.0-8-bookworm` ) +- `mcr.microsoft.com/devcontainers/php:2.0.0-8` (or `3.0.0-8-trixie`, `3.0.0-8-bookworm` ) -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. +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. 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). diff --git a/src/php/manifest.json b/src/php/manifest.json index 216b2f9743..14474fee77 100644 --- a/src/php/manifest.json +++ b/src/php/manifest.json @@ -1,20 +1,24 @@ { - "version": "2.0.4", + "version": "3.0.0", + "variants": [ + "8.5-apache-trixie", "8.4-apache-trixie", "8.3-apache-trixie", "8.2-apache-trixie", + "8.5-apache-bookworm", "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.2-apache-bookworm" ], "build": { - "latest": "8.4-apache-trixie", + "latest": "8.5-apache-trixie", "rootDistro": "debian", "architectures": { + "8.5-apache-trixie": [ + "linux/amd64", + "linux/arm64" + ], "8.4-apache-trixie": [ "linux/amd64", "linux/arm64" @@ -26,11 +30,15 @@ "8.2-apache-trixie": [ "linux/amd64", "linux/arm64" + ], + "8.5-apache-bookworm": [ + "linux/amd64", + "linux/arm64" ], "8.4-apache-bookworm": [ "linux/amd64", "linux/arm64" - ], + ], "8.3-apache-bookworm": [ "linux/amd64", "linux/arm64" @@ -38,31 +46,23 @@ "8.2-apache-bookworm": [ "linux/amd64", "linux/arm64" - ], - "8.4-apache-bullseye": [ - "linux/amd64", - "linux/arm64" - ], - "8.3-apache-bullseye": [ - "linux/amd64", - "linux/arm64" - ], - "8.2-apache-bullseye": [ - "linux/amd64", - "linux/arm64" ] }, "tags": [ "php:${VERSION}-${VARIANT}" ], "variantTags": { - "8.4-apache-trixie": [ + "8.5-apache-trixie": [ "php:${VERSION}-8", - "php:${VERSION}-8.4", + "php:${VERSION}-8.5", "php:${VERSION}-8-trixie", - "php:${VERSION}-8.4-trixie", + "php:${VERSION}-8.5-trixie", "php:${VERSION}-trixie" ], + "8.4-apache-trixie": [ + "php:${VERSION}-8.4", + "php:${VERSION}-8.4-trixie" + ], "8.3-apache-trixie": [ "php:${VERSION}-8.3", "php:${VERSION}-8.3-trixie" @@ -70,28 +70,20 @@ "8.2-apache-trixie": [ "php:${VERSION}-8.2", "php:${VERSION}-8.2-trixie" - ], - "8.4-apache-bookworm": [ + ], + "8.5-apache-bookworm": [ "php:${VERSION}-8-bookworm", - "php:${VERSION}-8.4-bookworm", + "php:${VERSION}-8.5-bookworm", "php:${VERSION}-bookworm" + ], + "8.4-apache-bookworm": [ + "php:${VERSION}-8.4-bookworm" ], "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", - "php:${VERSION}-8.4-bullseye", - "php:${VERSION}-bullseye" - ], - "8.3-apache-bullseye": [ - "php:${VERSION}-8.3-bullseye" - ], - "8.2-apache-bullseye": [ - "php:${VERSION}-8.2-bullseye" ] } }, diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 1e33d962bb..79f40398d3 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -30,8 +30,8 @@ "useOryxIfAvailable": "false" }, "ghcr.io/devcontainers/features/php:1": { - "version": "8.4.8", - "additionalVersions": "8.3.14", + "version": "8.5.0", + "additionalVersions": "8.4.2", "installComposer": "true" }, "ghcr.io/devcontainers/features/conda:1": {