Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/php-mariadb/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/php-mariadb/NOTES.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/php-mariadb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 6 additions & 2 deletions src/php-mariadb/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -20,7 +24,7 @@
"8.3-bullseye",
"8.4-bullseye"
],
"default": "8.2-bookworm"
"default": "8.4-trixie"
}
},
"platforms": [
Expand Down
2 changes: 1 addition & 1 deletion src/php/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion src/php/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
10 changes: 7 additions & 3 deletions src/php/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -20,7 +24,7 @@
"8.3-bullseye",
"8.4-bullseye"
],
"default": "8.2-bullseye"
"default": "8.4-trixie"
}
},
"platforms": ["PHP"],
Expand Down
Loading