Skip to content

Commit ea0de43

Browse files
PHP: Reverts 8.0-apache-bookworm (#628)
1 parent b2fb0c8 commit ea0de43

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

src/php/.devcontainer/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-bookworm, 8.2-apache-bookworm, 8.1-apache-bookworm, 8.0-apache-bookworm, 8-apache-bullseye, 8.2-apache-bullseye, 8.1-apache-bullseye, 8.0-apache-bullseye, 8-apache-buster, 8.2-apache-buster, 8.1-apache-buster, 8.0-apache-buster
1+
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8-apache-bookworm, 8.2-apache-bookworm, 8.1-apache-bookworm, 8-apache-bullseye, 8.2-apache-bullseye, 8.1-apache-bullseye, 8.0-apache-bullseye, 8-apache-buster, 8.2-apache-buster, 8.1-apache-buster, 8.0-apache-buster
22
ARG VARIANT=8.2-apache-bookworm
33
FROM php:${VARIANT}
44

src/php/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2525
- `mcr.microsoft.com/devcontainers/php:8` (or `8-bookworm`, `8-bullseye`, `8-buster` to pin to an OS version)
2626
- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-bookworm`, `8.2-bullseye`, `8.2-buster` to pin to an OS version)
2727
- `mcr.microsoft.com/devcontainers/php:8.1` (or `8.1-bookworm`, `8.1-bullseye`, `8.1-buster` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/php:8.0` (or `8.0-bookworm`, `8.0-bullseye`, `8.0-buster` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/php:8.0` (or `8.0-bullseye`, `8.0-buster` to pin to an OS version)
2929

3030
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3131

src/php/manifest.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"variants": [
44
"8.2-apache-bookworm",
55
"8.1-apache-bookworm",
6-
"8.0-apache-bookworm",
76
"8.2-apache-bullseye",
87
"8.1-apache-bullseye",
98
"8.0-apache-bullseye",
@@ -23,10 +22,6 @@
2322
"linux/amd64",
2423
"linux/arm64"
2524
],
26-
"8.0-apache-bookworm": [
27-
"linux/amd64",
28-
"linux/arm64"
29-
],
3025
"8.2-apache-bullseye": [
3126
"linux/amd64",
3227
"linux/arm64"
@@ -64,10 +59,6 @@
6459
"php:${VERSION}-8.1",
6560
"php:${VERSION}-8.1-bookworm"
6661
],
67-
"8.0-apache-bookworm": [
68-
"php:${VERSION}-8.0",
69-
"php:${VERSION}-8.0-bookworm"
70-
],
7162
"8.2-apache-bullseye": [
7263
"php:${VERSION}-8-bullseye",
7364
"php:${VERSION}-8.2-bullseye",
@@ -77,6 +68,7 @@
7768
"php:${VERSION}-8.1-bullseye"
7869
],
7970
"8.0-apache-bullseye": [
71+
"php:${VERSION}-8.0",
8072
"php:${VERSION}-8.0-bullseye"
8173
],
8274
"8.2-apache-buster": [

0 commit comments

Comments
 (0)