diff --git a/src/php-mariadb/.devcontainer/Dockerfile b/src/php-mariadb/.devcontainer/Dockerfile index f7c53caf..ab93e9c1 100644 --- a/src/php-mariadb/.devcontainer/Dockerfile +++ b/src/php-mariadb/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/php:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/php:2-${templateOption:imageVariant} # Install MariaDB client RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/src/php-mariadb/NOTES.md b/src/php-mariadb/NOTES.md index a34dd789..47392ad8 100644 --- a/src/php-mariadb/NOTES.md +++ b/src/php-mariadb/NOTES.md @@ -1,7 +1,7 @@ This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. * **Image**: mcr.microsoft.com/devcontainers/php ([source](https://github.com/devcontainers/images/tree/main/src/php)) -* **Applies devcontainer.json contents from image**: Yes ([source](https://github.com/devcontainers/images/blob/main/src/php/.devcontainer/devcontainer.json)) +* **Applies devcontainer.json contents from image** : Yes ([source](https://github.com/devcontainers/images/blob/main/src/php/.devcontainer/devcontainer.json)) ## Using this template diff --git a/src/php-mariadb/README.md b/src/php-mariadb/README.md index 19c134c3..c0460583 100644 --- a/src/php-mariadb/README.md +++ b/src/php-mariadb/README.md @@ -7,7 +7,7 @@ Develop PHP applications with MariaDB (MySQL Compatible). | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm | +| imageVariant | PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-trixie | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/php-mariadb/devcontainer-template.json b/src/php-mariadb/devcontainer-template.json index f57935ba..e92f0500 100644 --- a/src/php-mariadb/devcontainer-template.json +++ b/src/php-mariadb/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "php-mariadb", - "version": "4.2.0", + "version": "5.0.0", "name": "PHP & MariaDB", "description": "Develop PHP applications with MariaDB (MySQL Compatible).", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php-mariadb", @@ -11,6 +11,10 @@ "type": "string", "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "8-trixie", + "8.2-trixie", + "8.3-trixie", + "8.4-trixie", "8-bookworm", "8.2-bookworm", "8.3-bookworm", @@ -20,7 +24,7 @@ "8.3-bullseye", "8.4-bullseye" ], - "default": "8.2-bookworm" + "default": "8.4-trixie" } }, "platforms": [ diff --git a/src/php/.devcontainer/devcontainer.json b/src/php/.devcontainer/devcontainer.json index 1e97ec2f..9171679e 100644 --- a/src/php/.devcontainer/devcontainer.json +++ b/src/php/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "PHP", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/php:1-${templateOption:imageVariant}", + "image": "mcr.microsoft.com/devcontainers/php:2-${templateOption:imageVariant}", // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/src/php/README.md b/src/php/README.md index 3ed6c44f..ca83d754 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -7,7 +7,7 @@ Develop PHP based applications. Includes needed tools, extensions, and dependenc | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm | +| imageVariant | PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-trixie | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/php/devcontainer-template.json b/src/php/devcontainer-template.json index 1f2b8faa..b0dd685e 100644 --- a/src/php/devcontainer-template.json +++ b/src/php/devcontainer-template.json @@ -1,8 +1,8 @@ { "id": "php", - "version": "4.2.0", + "version": "5.0.0", "name": "PHP", - "description": "Develop PHP based applications. Includes needed tools, extensions, and dependencies.", + "description": "Develop PHP based applications. Includes needed tools, extensions and dependencies.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php", "publisher": "Dev Container Spec Maintainers", "licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE", @@ -11,6 +11,10 @@ "type": "string", "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "8-trixie", + "8.2-trixie", + "8.3-trixie", + "8.4-trixie", "8-bookworm", "8.2-bookworm", "8.3-bookworm", @@ -20,7 +24,7 @@ "8.3-bullseye", "8.4-bullseye" ], - "default": "8.2-bullseye" + "default": "8.4-trixie" } }, "platforms": ["PHP"],