Jekyll: Debian:bookworm support (devcontainers#638)

* jekyll

* fix test

Author: samruddhikhandale

src/jekyll/.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
-# [Choice] Debian OS version (use 3.2-bullseye on local arm64/Apple Silicon): 3.2-bullseye, 3.2-buster
-ARG VARIANT=3.2-bullseye
+# [Choice] Debian OS version (use 3.2-bookworm, or 3.2-bullseye on local arm64/Apple Silicon): 3.2-bookworm, 3.2-bullseye, 3.2-buster
+ARG VARIANT=3.2-bookworm
 FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
 
 USER root

src/jekyll/README.md

@@ -9,8 +9,8 @@
 | *Categories* | Community, Languages, Frameworks |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/jekyll |
-| *Available image variants* | bullseye, buster ([full list](https://mcr.microsoft.com/v2/devcontainers/jekyll/tags/list)) |
-| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variant |
+| *Available image variants* | bookworm, bullseye, buster ([full list](https://mcr.microsoft.com/v2/devcontainers/jekyll/tags/list)) |
+| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variant |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
 | *Languages, platforms* | Ruby, Jekyll |
@@ -30,16 +30,17 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 
 - `mcr.microsoft.com/devcontainers/jekyll` (latest)
+- `mcr.microsoft.com/devcontainers/jekyll:bookworm`
 - `mcr.microsoft.com/devcontainers/jekyll:bullseye`
 - `mcr.microsoft.com/devcontainers/jekyll:buster`
 
 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/jekyll:1` (or `1-bullseye`, `1-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/jekyll:1.0` (or `1.0-bullseye`, `1.0-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/jekyll:1.0.0` (or `1.0.0-bullseye`, `1.0.0-buster` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/jekyll:2` (or `2-bookworm`, `2-bullseye`, `2-buster` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/jekyll:2.0` (or `2.0-bookworm`, `2.0-bullseye`, `2.0-buster` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/jekyll:2.0.0` (or `2.0.0-bookworm`, `2.0.0-bullseye`, `2.0.0-buster` to pin to an OS version)
 
-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. `1-bullseye`). 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.
+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. `2-bullseye`). 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.
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/jekyll/tags/list).
 

src/jekyll/manifest.json

@@ -1,14 +1,19 @@
 {
 	"version": "1.0.2",
 	"variants": [
+		"3.2-bookworm",
 		"3.2-bullseye",
 		"3.2-buster"
 	],
 	"build": {
-		"latest": "3.2-bullseye",
+		"latest": "3.2-bookworm",
 		"parent": "ruby",
 		"rootDistro": "debian",
 		"architectures": {
+			"3.2-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"3.2-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
@@ -21,8 +26,11 @@
 			"jekyll:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"3.2-bullseye": [
+			"3.2-bookworm": [
 				"jekyll:${VERSION}",
+				"jekyll:${VERSION}-bookworm"
+			],
+			"3.2-bullseye": [
 				"jekyll:${VERSION}-bullseye"
 			],
 			"3.2-buster": [

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

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