PHP: Support for debian - bookworm (devcontainers#624)

* php

* fix test

Author: samruddhikhandale

src/php/.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
-# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 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-bullseye
+# [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
+ARG VARIANT=8.2-apache-bookworm
 FROM php:${VARIANT}
 
 # Install xdebug

src/php/README.md

@@ -9,8 +9,8 @@
 | *Categories* | Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/php |
-| *Available image variants* | 8 / 8-bullseye, 8.2 / 8.2-bullseye, 8.1 / 8.1-bullseye, 8.0 / 8.0-bullseye, 8-buster, 8.2-buster, 8.1-buster, 8.0-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
-| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
+| *Available image variants* | 8 / 8-bookworm, 8.2 / 8.2-bookworm, 8.1 / 8.1-bookworm, 8.0 / 8.0-bookworm, 8-bullseye, 8.2-bullseye, 8.1-bullseye, 8.0-bullseye, 8-buster, 8.2-buster, 8.1-buster, 8.0-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
+| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
 | *Languages, platforms* | PHP |
@@ -22,18 +22,18 @@ See **[history](history)** for information on the contents of published images.
 You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` with one of the following:
 
 - `mcr.microsoft.com/devcontainers/php` (latest)
-- `mcr.microsoft.com/devcontainers/php:8` (or `8-bullseye`, `8-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-bullseye`, `8.2-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/php:8.1` (or `8.1-bullseye`, `8.1-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)
+- `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)
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/devcontainers/php:0-8` (or `0-8-bullseye`, `0-8-buster`)
-- `mcr.microsoft.com/devcontainers/php:0.203-8` (or `0.203-8-bullseye`, `0.203-8-buster`)
-- `mcr.microsoft.com/devcontainers/php:0.203.3-8` (or `0.203.3-8-bullseye`, `0.203.3-8-buster`)
+- `mcr.microsoft.com/devcontainers/php:0-8` (or `0-8-bookworm`, `0-8-bullseye`, `0-8-buster`)
+- `mcr.microsoft.com/devcontainers/php:0.203-8` (or `0.203-8-bookworm`, `0.203-8-bullseye`, `0.203-8-buster`)
+- `mcr.microsoft.com/devcontainers/php:0.203.3-8` (or `0.203.3-8-bookworm`, `0.203.3-8-bullseye`, `0.203.3-8-buster`)
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `0-8`). 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.
 

src/php/manifest.json

@@ -1,6 +1,9 @@
 {
 	"version": "0.203.25",
 	"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",
@@ -9,9 +12,21 @@
 		"8.0-apache-buster"
 	],
 	"build": {
-		"latest": "8.2-apache-bullseye",
+		"latest": "8.2-apache-bookworm",
 		"rootDistro": "debian",
 		"architectures": {
+			"8.2-apache-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
+			"8.1-apache-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
+			"8.0-apache-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"8.2-apache-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
@@ -38,19 +53,30 @@
 			"php:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"8.2-apache-bullseye": [
+			"8.2-apache-bookworm": [
 				"php:${VERSION}-8",
 				"php:${VERSION}-8.2",
+				"php:${VERSION}-8-bookworm",
+				"php:${VERSION}-8.2-bookworm",
+				"php:${VERSION}-bookworm"
+			],
+			"8.1-apache-bookworm": [
+				"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",
 				"php:${VERSION}-bullseye"
 			],
 			"8.1-apache-bullseye": [
-				"php:${VERSION}-8.1",
 				"php:${VERSION}-8.1-bullseye"
 			],
 			"8.0-apache-bullseye": [
-				"php:${VERSION}-8.0",
 				"php:${VERSION}-8.0-bullseye"
 			],
 			"8.2-apache-buster": [

src/php/test-project/test-utils.sh

@@ -121,7 +121,7 @@ checkCommon()
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        liblttng-ust0 \
+        liblttng-ust1 \
         libstdc++6 \
         zlib1g \
         locales \