Skip to content

Commit 53828b8

Browse files
samruddhikhandalesamruddhikhandale
authored
Images: Support debian 12 (bookworm) (devcontainers#608)
* Cpp, Java, Java-8 : Support debian 12 (bookworm) * Fix test * js-node, php, rust * reverts php: tag available, but image does not exist yet * fix test * Update push-dev.yml * Update push.yml
1 parent f548125 commit 53828b8

File tree

22 files changed

+124
-57
lines changed

22 files changed

+124
-57
lines changed

‎.github/workflows/push-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: "github.ref == 'refs/heads/main'"
1212
strategy:
1313
matrix:
14-
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50]
15-
page-total: [50]
14+
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58]
15+
page-total: [58]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

‎.github/workflows/push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: ${{ github.event.base_ref == 'refs/heads/main' }}
1212
strategy:
1313
matrix:
14-
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50]
15-
page-total: [50]
14+
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58]
15+
page-total: [58]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

‎src/cpp/.devcontainer/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04
2-
ARG VARIANT=debian-11
3-
FROM mcr.microsoft.com/devcontainers/base:0-${VARIANT}
1+
# [Choice] Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 22.04 on local arm64/Apple Silicon): debian-12, debian-11, debian-10, ubuntu-22.04, ubuntu-20.04
2+
ARG VARIANT=debian-12
3+
FROM mcr.microsoft.com/devcontainers/base:${VARIANT}
44
USER root
55

66
# Install needed packages. Use a separate RUN statement to add your own dependencies.

‎src/cpp/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/cpp |
12-
| *Available image variants* | debian-11, debian-10, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`,and `ubuntu-22.04` variants |
12+
| *Available image variants* | debian-12, debian-11, debian-10, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `debian-11`,and `ubuntu-22.04` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian, Ubuntu |
1616
| *Languages, platforms* | C++ |
@@ -23,6 +23,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2323

2424
- `mcr.microsoft.com/devcontainers/cpp` (latest Debian GA)
2525
- `mcr.microsoft.com/devcontainers/cpp:debian` (latest Debian GA)
26+
- `mcr.microsoft.com/devcontainers/cpp:debian-12` (or `bookworm`)
2627
- `mcr.microsoft.com/devcontainers/cpp:debian-11` (or `bullseye`)
2728
- `mcr.microsoft.com/devcontainers/cpp:debian-10` (or `buster`)
2829
- `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)

‎src/cpp/manifest.json‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
{
22
"version": "0.206.9",
33
"variants": [
4+
"bookworm",
45
"bullseye",
56
"buster",
67
"jammy",
78
"focal"
89
],
910
"build": {
10-
"latest": "bullseye",
11+
"latest": "bookworm",
1112
"parent": {
13+
"bookworm": "base-debian",
1214
"bullseye": "base-debian",
1315
"buster": "base-debian",
1416
"jammy": "base-ubuntu",
1517
"focal": "base-ubuntu"
1618
},
1719
"rootDistro": "debian",
1820
"architectures": {
21+
"bookworm": [
22+
"linux/amd64",
23+
"linux/arm64"
24+
],
1925
"bullseye": [
2026
"linux/amd64",
2127
"linux/arm64"
@@ -35,10 +41,15 @@
3541
"cpp:${VERSION}-${VARIANT}"
3642
],
3743
"variantTags": {
44+
"bookworm": [
45+
"cpp:${VERSION}-debian-12",
46+
"cpp:${VERSION}-debian12",
47+
"cpp:${VERSION}-debian",
48+
"cpp:${VERSION}"
49+
],
3850
"bullseye": [
3951
"cpp:${VERSION}-debian-11",
4052
"cpp:${VERSION}-debian11",
41-
"cpp:${VERSION}-debian",
4253
"cpp:${VERSION}"
4354
],
4455
"buster": [
@@ -49,10 +60,6 @@
4960
"cpp:${VERSION}-ubuntu-22.04",
5061
"cpp:${VERSION}-ubuntu22.04"
5162
],
52-
"hirsute": [
53-
"cpp:${VERSION}-ubuntu-21.04",
54-
"cpp:${VERSION}-ubuntu21.04"
55-
],
5663
"focal": [
5764
"cpp:${VERSION}-ubuntu-20.04",
5865
"cpp:${VERSION}-ubuntu20.04",

‎src/cpp/test-project/test-utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ checkCommon()
126126
libc6 \
127127
libgcc1 \
128128
libgssapi-krb5-2 \
129-
liblttng-ust0 \
129+
liblttng-ust1 \
130130
libstdc++6 \
131131
zlib1g \
132132
locales \

‎src/java-8/.devcontainer/Dockerfile‎

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

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

‎src/java-8/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/java:8 |
12-
| *Available image variants* | 8 / 8-buster, 8-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variant |
12+
| *Available image variants* | 8 / 8-bookworm, 8-buster, 8-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` and `bookworm` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
1616
| *Languages, platforms* | Java |
@@ -23,7 +23,7 @@ See **[history](history)** for information on the contents of published images.
2323
2424
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.
2525

26-
- `mcr.microsoft.com/devcontainers/java:8` (or `8-bullseye`, `8-buster` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/java:8` (or `8-bookworm`, `8-bullseye`, `8-buster` to pin to an OS version)
2727

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

‎src/java-8/manifest.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"version": "1.0.18",
33
"variants": [
4+
"bookworm",
45
"bullseye",
56
"buster"
67
],
@@ -9,6 +10,10 @@
910
"rootDistro": "debian",
1011
"parent": "base-debian",
1112
"architectures": {
13+
"bookworm": [
14+
"linux/amd64",
15+
"linux/arm64"
16+
],
1217
"bullseye": [
1318
"linux/amd64",
1419
"linux/arm64"
@@ -21,8 +26,11 @@
2126
"java:${VERSION}-8-${VARIANT}"
2227
],
2328
"variantTags": {
24-
"buster": [
29+
"bookworm": [
2530
"java:${VERSION}-8",
31+
"java:${VERSION}-8-jdk-bookworm"
32+
],
33+
"buster": [
2634
"java:${VERSION}-8-jdk-buster"
2735
],
2836
"bullseye": [

‎src/java-8/test-project/test-utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ checkCommon()
126126
libc6 \
127127
libgcc1 \
128128
libgssapi-krb5-2 \
129-
liblttng-ust0 \
129+
liblttng-ust1 \
130130
libstdc++6 \
131131
zlib1g \
132132
locales \

0 commit comments

Comments
 (0)