Skip to content

Commit e402d15

Browse files
[Dotnet] - Supports bookworm (New major version) (#809)
* [Dotnet] - Supports bookworm * Fix test
1 parent c5de84f commit e402d15

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ARG VARIANT=7.0-bullseye-slim
1+
ARG VARIANT=7.0-bookworm-slim
22
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
33
ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools

src/dotnet/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/dotnet |
12-
| *Available image variants* | 6.0 /6.0-bullseye, 6.0-jammy, 6.0-focal, 7.0 /7.0-bullseye, 7.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye`, `jammy` variants |
12+
| *Available image variants* | 6.0 /6.0-bookworm, 6.0-bullseye, 6.0-jammy, 6.0-focal, 7.0 /7.0-bookworm, 7.0-bullseye, 7.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, `bullseye`, `jammy` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
15-
| *Container OS* | Ubuntu (`-focal`, `-jammy`), Debian (`-bullseye`) |
15+
| *Container OS* | Ubuntu (`-focal`, `-jammy`), Debian (`-bullseye`, `-bookworm`) |
1616
| *Languages, platforms* | .NET, .NET Core, C# |
1717

1818
See **[history](history)** for information on the contents of published images.
@@ -22,16 +22,16 @@ 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/dotnet` (latest)
25-
- `mcr.microsoft.com/devcontainers/dotnet:6.0` (or `6.0-bullseye`, `6.0-jammy`, `6.0-focal` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/dotnet:7.0` (or `7.0-bullseye`, `7.0-jammy` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/dotnet:6.0` (or `6.0-bookworm`, `6.0-bullseye`, `6.0-jammy`, `6.0-focal` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/dotnet:7.0` (or `7.0-bookworm`, `7.0-bullseye`, `7.0-jammy` to pin to an OS version)
2727

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

3030
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3131

32-
- `mcr.microsoft.com/devcontainers/dotnet:0-7.0`
33-
- `mcr.microsoft.com/devcontainers/dotnet:0.204-7.0`
34-
- `mcr.microsoft.com/devcontainers/dotnet:0.204.0-7.0`
32+
- `mcr.microsoft.com/devcontainers/dotnet:1-7.0`
33+
- `mcr.microsoft.com/devcontainers/dotnet:1.0-7.0`
34+
- `mcr.microsoft.com/devcontainers/dotnet:1.0.0-7.0`
3535

3636
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/dotnet/tags/list).
3737

src/dotnet/manifest.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"version": "0.204.14",
33
"variants": [
4+
"7.0-bookworm-slim",
45
"7.0-bullseye-slim",
56
"7.0-jammy",
7+
"6.0-bookworm-slim",
68
"6.0-bullseye-slim",
79
"6.0-jammy",
810
"6.0-focal"
@@ -14,6 +16,10 @@
1416
"dotnet:${VERSION}-${VARIANT}"
1517
],
1618
"architectures": {
19+
"7.0-bookworm-slim": [
20+
"linux/amd64",
21+
"linux/arm64"
22+
],
1723
"7.0-bullseye-slim": [
1824
"linux/amd64",
1925
"linux/arm64"
@@ -22,6 +28,10 @@
2228
"linux/amd64",
2329
"linux/arm64"
2430
],
31+
"6.0-bookworm-slim": [
32+
"linux/amd64",
33+
"linux/arm64"
34+
],
2535
"6.0-bullseye-slim": [
2636
"linux/amd64",
2737
"linux/arm64"
@@ -35,12 +45,18 @@
3545
]
3646
},
3747
"variantTags": {
38-
"7.0-bullseye-slim": [
48+
"7.0-bookworm-slim": [
3949
"dotnet:${VERSION}-7.0",
50+
"dotnet:${VERSION}-7.0-bookworm"
51+
],
52+
"7.0-bullseye-slim": [
4053
"dotnet:${VERSION}-7.0-bullseye"
4154
],
42-
"6.0-bullseye-slim": [
55+
"6.0-bookworm-slim": [
4356
"dotnet:${VERSION}-6.0",
57+
"dotnet:${VERSION}-6.0-bookworm"
58+
],
59+
"6.0-bullseye-slim": [
4460
"dotnet:${VERSION}-6.0-bullseye"
4561
]
4662
}

src/dotnet/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)