Skip to content

Commit 8eced02

Browse files
adding support for debian13 (trixie) for rust image (devcontainers#1500)
* adding support for debian13 (trixie) for rust image * updating manifest file * changes in manifest.json --------- Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
1 parent f35d505 commit 8eced02

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

src/rust/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [Choice] Debian OS version (use bookworm, or bullseye on local arm64/Apple Silicon): bookworm, buster, bullseye
2-
ARG VARIANT="bookworm"
2+
ARG VARIANT="trixie"
33
FROM rust:1-${VARIANT}
44

55
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

src/rust/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/rust |
1212
| *Available image variants* | bookworm, bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/rust/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variant |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` and `trixie` variant |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
1616
| *Languages, platforms* | Rust |
@@ -21,16 +21,16 @@ See **[history](history)** for information on the contents of published images.
2121

2222
You can directly reference pre-built versions of `.devcontainer/Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to the following. An example `Dockerfile` is included in this repository.
2323

24-
- `mcr.microsoft.com/devcontainers/rust:latest` (or `bookworm`, `bullseye` to pin to an OS version)
25-
- `mcr.microsoft.com/devcontainers/rust:1` (or `1-bookworm`, `1-bullseye` to pin to an OS version)
24+
- `mcr.microsoft.com/devcontainers/rust:latest` (or `trixie` `bookworm`, `bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/rust:1` (or `1-trixie` `1-bookworm`, `1-bullseye` to pin to an OS version)
2626

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

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

31-
- `mcr.microsoft.com/devcontainers/rust:1-1` (or `1-1-bookworm`, `1-1-bullseye` to pin to an OS version)
32-
- `mcr.microsoft.com/devcontainers/rust:1.0-1` (or `1.0-1-bookworm`, `1.0-1-bullseye` to pin to an OS version)
33-
- `mcr.microsoft.com/devcontainers/rust:1.0.0-1` (or `1.0.0-1-bookworm`, `1.0.0-1-bullseye` to pin to an OS version)
31+
- `mcr.microsoft.com/devcontainers/rust:1-1` (or `1-1-trixie`, `1-1-bookworm`, `1-1-bullseye` to pin to an OS version)
32+
- `mcr.microsoft.com/devcontainers/rust:1.0-1` (or `1.0-1-trixie`, `1.0-1-bookworm`, `1.0-1-bullseye` to pin to an OS version)
33+
- `mcr.microsoft.com/devcontainers/rust:1.0.0-1` (or `1.0.0-1-trixie`, `1.0.0-1-bookworm`, `1.0.0-1-bullseye` to pin to an OS version)
3434

3535
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-1`). 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.
3636

src/rust/manifest.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
2-
"version": "1.0.28",
2+
"version": "2.0.0",
33
"variants": [
4+
"trixie",
45
"bookworm",
56
"bullseye"
67
],
78
"build": {
8-
"latest": "bookworm",
9+
"latest": "trixie",
910
"rootDistro": "debian",
1011
"architectures": {
12+
"trixie": [
13+
"linux/amd64",
14+
"linux/arm64"
15+
],
1116
"bookworm": [
1217
"linux/amd64",
1318
"linux/arm64"
@@ -21,11 +26,14 @@
2126
"rust:${VERSION}-${VARIANT}"
2227
],
2328
"variantTags": {
29+
"trixie": [
30+
"rust:${VERSION}-1",
31+
"rust:${VERSION}-1-trixie"
32+
],
2433
"bullseye": [
2534
"rust:${VERSION}-1-bullseye"
2635
],
2736
"bookworm": [
28-
"rust:${VERSION}-1",
2937
"rust:${VERSION}-1-bookworm"
3038
]
3139
}

0 commit comments

Comments
 (0)