Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit d3e7e88

Browse files
ChuxelChuxel
authored
Add PHP 8.1 (#1179)
1 parent 772b66f commit d3e7e88

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

‎containers/php-mariadb/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.0-buster, 7-buster, 7.4-buster, 7.3-buster
2-
ARG VARIANT=7-bullseye
1+
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.1, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.1-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.1-buster, 8.0-buster, 7-buster, 7.4-buster
2+
ARG VARIANT=8-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/php:0-${VARIANT}
44

55
# Install MariaDB client

‎containers/php-mariadb/.devcontainer/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
context: .
77
dockerfile: Dockerfile
88
args:
9-
# Update 'VARIANT' to pick a version of PHP version: 8, 8.0, 7, 7.4, 7.3
9+
# Update 'VARIANT' to pick a version of PHP version: 8, 8.1, 8.0, 7, 7.4
1010
# Append -bullseye or -buster to pin to an OS version.
1111
# Use -bullseye variants on local arm64/Apple Silicon.
1212
VARIANT: "8-bullseye"

‎containers/php/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.0-buster, 7-buster, 7.4-buster, 7.3-buster
2-
ARG VARIANT=7-bullseye
1+
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.1, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.1-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.1-buster, 8.0-buster, 7-buster, 7.4-buster
2+
ARG VARIANT=8-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/php:${VARIANT}
44

55
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

‎containers/php/.devcontainer/base.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8-apache-bullseye, 8.0-apache-bullseye, 7-apache-bullseye, 7.4-apache-bullseye, 7.3-apache-bullseye, 8-apache-buster, 8.0-apache-buster, 7-apache-buster, 7.4-apache-buster, 7.3-apache-buster
1+
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8-apache-bullseye, 8.1-apache-bullseye, 8.0-apache-bullseye, 7-apache-bullseye, 7.4-apache-bullseye, 8-apache-buster, 8.1-apache-buster, 8.0-apache-buster, 7-apache-buster, 7.4-apache-buster
22
ARG VARIANT=7-apache-bullseye
33
FROM php:${VARIANT}
44

‎containers/php/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
// Update VARIANT to pick a PHP version: 8, 8.0, 7, 7.4, 7.3
6+
// Update VARIANT to pick a PHP version: 8, 8.1, 8.0, 7, 7.4
77
// Append -bullseye or -buster to pin to an OS version.
88
// Use -bullseye variants on local on arm64/Apple Silicon.
99
"VARIANT": "8-apache-bullseye",

‎containers/php/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| *Categories* | Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/vscode/devcontainers/php |
13-
| *Available image variants* | 8 / 8-bullseye, 8.0 / 8.0-bullseye, 7 / 7-bullseye, 7.4 / 7.4-bullseye, 7.3 / 7.3-bullseye, 8-buster, 8.0-buster, 7-buster, 7.5-buster, 7.3-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/php/tags/list)) |
13+
| *Available image variants* | 8 / 8-bullseye, 8.1 / 8.1-bullseye, 8.0 / 8.0-bullseye, 7 / 7-bullseye, 7.4 / 7.4-bullseye, 8-buster, 8.1-buster, 8.0-buster, 7-buster, 7.5-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/php/tags/list)) |
1414
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
1515
| *Works in Codespaces* | Yes |
1616
| *Container host OS support* | Linux, macOS, Windows |
@@ -32,16 +32,16 @@ You can also directly reference pre-built versions of `.devcontainer/base.Docker
3232

3333
- `mcr.microsoft.com/vscode/devcontainers/php` (latest)
3434
- `mcr.microsoft.com/vscode/devcontainers/php:8` (or `8-bullseye`, `8-buster` to pin to an OS version)
35+
- `mcr.microsoft.com/vscode/devcontainers/php:8.1` (or `8.1-bullseye`, `8.1-buster` to pin to an OS version)
3536
- `mcr.microsoft.com/vscode/devcontainers/php:8.0` (or `8.0-bullseye`, `8.0-buster` to pin to an OS version)
3637
- `mcr.microsoft.com/vscode/devcontainers/php:7` (or `7-bullseye`, `7-buster` to pin to an OS version)
3738
- `mcr.microsoft.com/vscode/devcontainers/php:7.4` (or `7.4-bullseye`, `7.4-buster` to pin to an OS version)
38-
- `mcr.microsoft.com/vscode/devcontainers/php:7.3` (or `7.3-bullseye`, `7.3-buster` to pin to an OS version)
3939

4040
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
4141

4242
- `mcr.microsoft.com/vscode/devcontainers/python:0-7` (or `0-7-bullseye`, `0-7-buster`)
43-
- `mcr.microsoft.com/vscode/devcontainers/python:0.202-7` (or `0.202-7-bullseye`, `0.202-7-buster`)
44-
- `mcr.microsoft.com/vscode/devcontainers/python:0.202.0-7` (or `0.202.0-7-bullseye`, `0.202.0-7-buster`)
43+
- `mcr.microsoft.com/vscode/devcontainers/python:0.203-7` (or `0.203-7-bullseye`, `0.203-7-buster`)
44+
- `mcr.microsoft.com/vscode/devcontainers/python:0.203.0-7` (or `0.203.0-7-bullseye`, `0.203.0-7-buster`)
4545

4646
However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-7`). 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.
4747

‎containers/php/definition-manifest.json‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,50 @@
11
{
2-
"variants": ["8.0-apache-bullseye", "7.4-apache-bullseye", "7.3-apache-bullseye", "8.0-apache-buster", "7.4-apache-buster", "7.3-apache-buster"],
3-
"definitionVersion": "0.202.1",
2+
"variants": ["8.1-apache-bullseye", "8.0-apache-bullseye", "7.4-apache-bullseye", "8.1-apache-buster", "8.0-apache-buster", "7.4-apache-buster" ],
3+
"definitionVersion": "0.203.0",
44
"build": {
5-
"latest": "8.0-apache-bullseye",
5+
"latest": "8.1-apache-bullseye",
66
"rootDistro": "debian",
77
"architectures": {
8+
"8.1-apache-bullseye": ["linux/amd64", "linux/arm64"],
89
"8.0-apache-bullseye": ["linux/amd64", "linux/arm64"],
910
"7.4-apache-bullseye": ["linux/amd64", "linux/arm64"],
10-
"7.3-apache-bullseye": ["linux/amd64", "linux/arm64"],
11+
"8.1-apache-buster": ["linux/amd64"],
1112
"8.0-apache-buster": ["linux/amd64"],
12-
"7.4-apache-buster": ["linux/amd64"],
13-
"7.3-apache-buster": ["linux/amd64"]
13+
"7.4-apache-buster": ["linux/amd64"]
1414
},
1515
"tags": [
1616
"php:${VERSION}-${VARIANT}"
1717
],
1818
"variantTags": {
19-
"8.0-apache-bullseye": [
19+
"8.1-apache-bullseye": [
2020
"php:${VERSION}-8",
21+
"php:${VERSION}-8.1",
2122
"php:${VERSION}-8-bullseye",
22-
"php:${VERSION}-8.0-bullseye",
23+
"php:${VERSION}-8.1-bullseye",
2324
"php:${VERSION}-bullseye"
2425
],
26+
"8.0-apache-bullseye": [
27+
"php:${VERSION}-8.0",
28+
"php:${VERSION}-8.0-bullseye"
29+
],
2530
"7.4-apache-bullseye": [
2631
"php:${VERSION}-7" ,
2732
"php:${VERSION}-7-bullseye",
2833
"php:${VERSION}-7.4",
2934
"php:${VERSION}-7.4-bullseye"
3035
],
31-
"7.3-apache-bullseye": [
32-
"php:${VERSION}-7.3",
33-
"php:${VERSION}-7.3-bullseye"
34-
],
35-
"8.0-apache-buster": [
36+
"8.1-apache-buster": [
3637
"php:${VERSION}-8-buster",
37-
"php:${VERSION}-8.0-buster",
38+
"php:${VERSION}-8.1-buster",
3839
"php:${VERSION}-buster"
3940
],
41+
"8.0-apache-buster": [
42+
"php:${VERSION}-8.0-buster"
43+
],
4044
"7.4-apache-buster": [
4145
"php:${VERSION}-7-buster",
4246
"php:${VERSION}-7.4-buster"
43-
],
44-
"7.3-apache-buster": [ "php:${VERSION}-7.3-buster" ]
47+
]
4548
}
4649
},
4750
"dependencies": {

0 commit comments

Comments
 (0)