Skip to content
Merged
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
PHP: Reverts 8.0-apache-bookworm
  • Loading branch information
samruddhikhandale committed Jun 15, 2023
commit 2606ab3f87c682867836357bffb27df98d3cb23c
2 changes: 1 addition & 1 deletion src/php/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [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
# [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
ARG VARIANT=8.2-apache-bookworm
FROM php:${VARIANT}

Expand Down
2 changes: 1 addition & 1 deletion src/php/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
- `mcr.microsoft.com/devcontainers/php:8` (or `8-bookworm`, `8-bullseye`, `8-buster` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-bookworm`, `8.2-bullseye`, `8.2-buster` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/php:8.1` (or `8.1-bookworm`, `8.1-bullseye`, `8.1-buster` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/php:8.0` (or `8.0-bookworm`, `8.0-bullseye`, `8.0-buster` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/php:8.0` (or `8.0-bullseye`, `8.0-buster` to pin to an OS version)

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

Expand Down
10 changes: 1 addition & 9 deletions src/php/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"variants": [
"8.2-apache-bookworm",
"8.1-apache-bookworm",
"8.0-apache-bookworm",
"8.2-apache-bullseye",
"8.1-apache-bullseye",
"8.0-apache-bullseye",
Expand All @@ -23,10 +22,6 @@
"linux/amd64",
"linux/arm64"
],
"8.0-apache-bookworm": [
"linux/amd64",
"linux/arm64"
],
"8.2-apache-bullseye": [
"linux/amd64",
"linux/arm64"
Expand Down Expand Up @@ -64,10 +59,6 @@
"php:${VERSION}-8.1",
"php:${VERSION}-8.1-bookworm"
],
"8.0-apache-bookworm": [
"php:${VERSION}-8.0",
"php:${VERSION}-8.0-bookworm"
],
"8.2-apache-bullseye": [
"php:${VERSION}-8-bullseye",
"php:${VERSION}-8.2-bullseye",
Expand All @@ -77,6 +68,7 @@
"php:${VERSION}-8.1-bullseye"
],
"8.0-apache-bullseye": [
"php:${VERSION}-8.0",
"php:${VERSION}-8.0-bullseye"
],
"8.2-apache-buster": [
Expand Down