Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/php/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VARIANT=8.4-apache-trixie
ARG VARIANT=8.5-apache-trixie

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

FROM php:${VARIANT}

# Install xdebug
Expand All @@ -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 <your-package-list-here>
21 changes: 11 additions & 10 deletions src/php/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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).

Expand Down
64 changes: 28 additions & 36 deletions src/php/manifest.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -26,72 +30,60 @@
"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"
],
"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"
],
"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"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/universal/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading