diff --git a/src/php-mariadb/.devcontainer/Dockerfile b/src/php-mariadb/.devcontainer/Dockerfile index f7c53caf..080f627d 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:3-${templateOption:imageVariant} # Install MariaDB client RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/src/php-mariadb/README.md b/src/php-mariadb/README.md index 19c134c3..4ef91199 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 -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.5-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..a55dee83 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": "4.3.0", "name": "PHP & MariaDB", "description": "Develop PHP applications with MariaDB (MySQL Compatible).", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php-mariadb", @@ -9,18 +9,21 @@ "options": { "imageVariant": { "type": "string", - "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", + "description": "PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ - "8-bookworm", - "8.2-bookworm", - "8.3-bookworm", + "8.5-trixie", + "8.5-bookworm", + "8.5-bullseye", + "8.4-trixie", "8.4-bookworm", - "8-bullseye", - "8.2-bullseye", + "8.4-bullseye", + "8.3-trixie", + "8.3-bookworm", "8.3-bullseye", - "8.4-bullseye" + "8-bullseye", + "8-trixie" ], - "default": "8.2-bookworm" + "default": "8.5-trixie" } }, "platforms": [ diff --git a/src/php/.devcontainer/devcontainer.json b/src/php/.devcontainer/devcontainer.json index 1e97ec2f..61287808 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:3-${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..7b23cdfa 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 -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.5-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..6881ce16 100644 --- a/src/php/devcontainer-template.json +++ b/src/php/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "php", - "version": "4.2.0", + "version": "4.3.0", "name": "PHP", "description": "Develop PHP based applications. Includes needed tools, extensions, and dependencies.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php", @@ -9,18 +9,19 @@ "options": { "imageVariant": { "type": "string", - "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", + "description": "PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "8.5-trixie", + "8.5-bookworm", + "8.5-bullseye", "8-bookworm", - "8.2-bookworm", "8.3-bookworm", "8.4-bookworm", "8-bullseye", - "8.2-bullseye", "8.3-bullseye", "8.4-bullseye" ], - "default": "8.2-bullseye" + "default": "8.5-trixie" } }, "platforms": ["PHP"], diff --git a/test/php-mariadb/test.sh b/test/php-mariadb/test.sh index 49f2a6cb..f29fe6ec 100755 --- a/test/php-mariadb/test.sh +++ b/test/php-mariadb/test.sh @@ -17,7 +17,7 @@ checkExtension "mrmlnc.vscode-apache" check "php" php --version check "apache2ctl" which apache2ctl sleep 15 # Sleep to be sure MariaDB is running. -check "mariadb" mariadb -h localhost -P 3306 --protocol=tcp -u root --password=mariadb -D mariadb -Bse exit +check "mariadb" mariadb -h localhost -P 3306 --protocol=tcp -u root --password=mariadb -D mariadb --skip-ssl-verify-server-cert -Bse exit # Report result reportResults