Skip to content

Commit e90321f

Browse files
Debian: Support debian 12 (bookworm) (#601)
* debian: Support debian 12 (bookworm) * nit * fix test; available newer version of liblttng-ust
1 parent 0bea30e commit e90321f

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

build/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"libkrb5-3",
8383
"libgssapi-krb5-2",
8484
"libicu[0-9][0-9]",
85-
"liblttng-ust0",
85+
"liblttng-ust[0-9]",
8686
"libstdc++6",
8787
"zlib1g",
8888
"locales",

src/base-debian/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bullseye, buster
2-
ARG VARIANT="bullseye"
1+
# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bookworm, bullseye, buster
2+
ARG VARIANT="bookworm"
33
FROM buildpack-deps:${VARIANT}-curl
44

55
# [Optional] Uncomment this section to install additional OS packages.

src/base-debian/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:debian |
12-
| *Available image variants* | buster, bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye` variant |
12+
| *Available image variants* | bookworm, buster, bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bookworm`, and `bullseye` variant |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
1616
| *Languages, platforms* | Any |
@@ -22,6 +22,7 @@ See **[history](history)** for information on the contents of published images.
2222
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` to one of the following. An example `Dockerfile` is included in this repository.
2323

2424
- `mcr.microsoft.com/devcontainers/base:debian` (latest)
25+
- `mcr.microsoft.com/devcontainers/base:bookworm` (or `debian-12`)
2526
- `mcr.microsoft.com/devcontainers/base:bullseye` (or `debian-11`)
2627
- `mcr.microsoft.com/devcontainers/base:buster` (or `debian-10`)
2728

src/base-debian/manifest.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
22
"version": "0.203.10",
33
"variants": [
4+
"bookworm",
45
"buster",
56
"bullseye"
67
],
78
"build": {
8-
"latest": "bullseye",
9+
"latest": "bookworm",
910
"rootDistro": "debian",
1011
"architectures": {
12+
"bookworm": [
13+
"linux/amd64",
14+
"linux/arm64"
15+
],
1116
"bullseye": [
1217
"linux/amd64",
1318
"linux/arm64"
@@ -20,12 +25,16 @@
2025
"base:${VERSION}-${VARIANT}"
2126
],
2227
"variantTags": {
23-
"bullseye": [
24-
"base:${VERSION}-debian-11",
25-
"base:${VERSION}-debian11",
28+
"bookworm": [
29+
"base:${VERSION}-debian-12",
30+
"base:${VERSION}-debian12",
2631
"base:${VERSION}-debian",
2732
"base:${VERSION}"
2833
],
34+
"bullseye": [
35+
"base:${VERSION}-debian-11",
36+
"base:${VERSION}-debian11"
37+
],
2938
"buster": [
3039
"base:${VERSION}-debian-10",
3140
"base:${VERSION}-debian10"

src/base-debian/test-project/test-utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ checkCommon()
121121
libc6 \
122122
libgcc1 \
123123
libgssapi-krb5-2 \
124-
liblttng-ust0 \
124+
liblttng-ust1 \
125125
libstdc++6 \
126126
zlib1g \
127127
locales \

0 commit comments

Comments
 (0)