diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml index 9e6a19a86..982fc7107 100644 --- a/.github/workflows/push-dev.yml +++ b/.github/workflows/push-dev.yml @@ -11,8 +11,8 @@ jobs: if: "github.ref == 'refs/heads/main'" strategy: matrix: - 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] - page-total: [50] + 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] + page-total: [58] fail-fast: false runs-on: devcontainer-image-builder-ubuntu steps: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 66b8f67b8..12c544562 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,8 +11,8 @@ jobs: if: ${{ github.event.base_ref == 'refs/heads/main' }} strategy: matrix: - 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] - page-total: [50] + 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] + page-total: [58] fail-fast: false runs-on: devcontainer-image-builder-ubuntu steps: diff --git a/src/cpp/.devcontainer/Dockerfile b/src/cpp/.devcontainer/Dockerfile index c2f2a67a7..abdbe2341 100644 --- a/src/cpp/.devcontainer/Dockerfile +++ b/src/cpp/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ -# [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 -ARG VARIANT=debian-11 -FROM mcr.microsoft.com/devcontainers/base:0-${VARIANT} +# [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 +ARG VARIANT=debian-12 +FROM mcr.microsoft.com/devcontainers/base:${VARIANT} USER root # Install needed packages. Use a separate RUN statement to add your own dependencies. diff --git a/src/cpp/README.md b/src/cpp/README.md index cff976e40..c212942a8 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/cpp | -| *Available image variants* | debian-11, debian-10, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) | -| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`,and `ubuntu-22.04` variants | +| *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)) | +| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `debian-11`,and `ubuntu-22.04` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian, Ubuntu | | *Languages, platforms* | C++ | @@ -23,6 +23,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag - `mcr.microsoft.com/devcontainers/cpp` (latest Debian GA) - `mcr.microsoft.com/devcontainers/cpp:debian` (latest Debian GA) +- `mcr.microsoft.com/devcontainers/cpp:debian-12` (or `bookworm`) - `mcr.microsoft.com/devcontainers/cpp:debian-11` (or `bullseye`) - `mcr.microsoft.com/devcontainers/cpp:debian-10` (or `buster`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS) diff --git a/src/cpp/manifest.json b/src/cpp/manifest.json index 0c51ebbd0..59cc41858 100644 --- a/src/cpp/manifest.json +++ b/src/cpp/manifest.json @@ -1,14 +1,16 @@ { "version": "0.206.9", "variants": [ + "bookworm", "bullseye", "buster", "jammy", "focal" ], "build": { - "latest": "bullseye", + "latest": "bookworm", "parent": { + "bookworm": "base-debian", "bullseye": "base-debian", "buster": "base-debian", "jammy": "base-ubuntu", @@ -16,6 +18,10 @@ }, "rootDistro": "debian", "architectures": { + "bookworm": [ + "linux/amd64", + "linux/arm64" + ], "bullseye": [ "linux/amd64", "linux/arm64" @@ -35,10 +41,15 @@ "cpp:${VERSION}-${VARIANT}" ], "variantTags": { + "bookworm": [ + "cpp:${VERSION}-debian-12", + "cpp:${VERSION}-debian12", + "cpp:${VERSION}-debian", + "cpp:${VERSION}" + ], "bullseye": [ "cpp:${VERSION}-debian-11", "cpp:${VERSION}-debian11", - "cpp:${VERSION}-debian", "cpp:${VERSION}" ], "buster": [ @@ -49,10 +60,6 @@ "cpp:${VERSION}-ubuntu-22.04", "cpp:${VERSION}-ubuntu22.04" ], - "hirsute": [ - "cpp:${VERSION}-ubuntu-21.04", - "cpp:${VERSION}-ubuntu21.04" - ], "focal": [ "cpp:${VERSION}-ubuntu-20.04", "cpp:${VERSION}-ubuntu20.04", diff --git a/src/cpp/test-project/test-utils.sh b/src/cpp/test-project/test-utils.sh index fb02d9ae2..a29af4c46 100644 --- a/src/cpp/test-project/test-utils.sh +++ b/src/cpp/test-project/test-utils.sh @@ -126,7 +126,7 @@ checkCommon() libc6 \ libgcc1 \ libgssapi-krb5-2 \ - liblttng-ust0 \ + liblttng-ust1 \ libstdc++6 \ zlib1g \ locales \ diff --git a/src/java-8/.devcontainer/Dockerfile b/src/java-8/.devcontainer/Dockerfile index 025a6be8d..55069ff9a 100644 --- a/src/java-8/.devcontainer/Dockerfile +++ b/src/java-8/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye -ARG VARIANT="bullseye" +# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): bookworm, buster, bullseye +ARG VARIANT="bookworm" FROM mcr.microsoft.com/devcontainers/base:${VARIANT} # [Optional] Uncomment this section to install additional OS packages. diff --git a/src/java-8/README.md b/src/java-8/README.md index 81834c297..5c6e7cee0 100644 --- a/src/java-8/README.md +++ b/src/java-8/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/java:8 | -| *Available image variants* | 8 / 8-buster, 8-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) | -| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variant | +| *Available image variants* | 8 / 8-bookworm, 8-buster, 8-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) | +| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` and `bookworm` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | | *Languages, platforms* | Java | @@ -23,7 +23,7 @@ See **[history](history)** for information on the contents of published images. 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. -- `mcr.microsoft.com/devcontainers/java:8` (or `8-bullseye`, `8-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/java:8` (or `8-bookworm`, `8-bullseye`, `8-buster` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. diff --git a/src/java-8/manifest.json b/src/java-8/manifest.json index aab9c9393..a57cf73b3 100644 --- a/src/java-8/manifest.json +++ b/src/java-8/manifest.json @@ -1,6 +1,7 @@ { "version": "1.0.18", "variants": [ + "bookworm", "bullseye", "buster" ], @@ -9,6 +10,10 @@ "rootDistro": "debian", "parent": "base-debian", "architectures": { + "bookworm": [ + "linux/amd64", + "linux/arm64" + ], "bullseye": [ "linux/amd64", "linux/arm64" @@ -21,8 +26,11 @@ "java:${VERSION}-8-${VARIANT}" ], "variantTags": { - "buster": [ + "bookworm": [ "java:${VERSION}-8", + "java:${VERSION}-8-jdk-bookworm" + ], + "buster": [ "java:${VERSION}-8-jdk-buster" ], "bullseye": [ diff --git a/src/java-8/test-project/test-utils.sh b/src/java-8/test-project/test-utils.sh index fb02d9ae2..a29af4c46 100644 --- a/src/java-8/test-project/test-utils.sh +++ b/src/java-8/test-project/test-utils.sh @@ -126,7 +126,7 @@ checkCommon() libc6 \ libgcc1 \ libgssapi-krb5-2 \ - liblttng-ust0 \ + liblttng-ust1 \ libstdc++6 \ zlib1g \ locales \ diff --git a/src/java/.devcontainer/Dockerfile b/src/java/.devcontainer/Dockerfile index de25fec70..048738fa9 100644 --- a/src/java/.devcontainer/Dockerfile +++ b/src/java/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile uses separate build arguments instead of VARIANT ARG TARGET_JAVA_VERSION=11 -ARG BASE_IMAGE_VERSION_CODENAME=bullseye +ARG BASE_IMAGE_VERSION_CODENAME=bookworm FROM mcr.microsoft.com/devcontainers/base:${BASE_IMAGE_VERSION_CODENAME} USER root diff --git a/src/java/README.md b/src/java/README.md index dc5f55f68..429e43ae5 100644 --- a/src/java/README.md +++ b/src/java/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/java | -| *Available image variants* | 11 / 11-bullseye, 17 / 17-bullseye, 11-buster, 17-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) | -| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants | +| *Available image variants* | 11 / 11-bookworm, 17 / 17-bookworm, 11-bullseye, 17-bullseye, 11-buster, 17-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) | +| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | | *Languages, platforms* | Java | @@ -22,8 +22,8 @@ See **[history](history)** for information on the contents of published images. 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. - `mcr.microsoft.com/devcontainers/java` (latest) -- `mcr.microsoft.com/devcontainers/java:11` (or `11-bullseye`, `11-buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/java:17` (or `17-bullseye`, `17-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/java:11` (or `17-bookworm`, `11-bullseye`, `11-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/java:17` (or `17-bookworm`, `17-bullseye`, `17-buster` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. diff --git a/src/java/manifest.json b/src/java/manifest.json index 66f1cc47c..6f87d195a 100644 --- a/src/java/manifest.json +++ b/src/java/manifest.json @@ -1,17 +1,27 @@ { "version": "0.205.25", "variants": [ + "17-bookworm", "17-bullseye", "17-buster", + "11-bookworm", "11-bullseye", "11-buster" ], "build": { - "latest": "17-bullseye", + "latest": "17-bookworm", "rootDistro": "debian", "parent": "base-debian", "idMismatch": "true", "variantBuildArgs": { + "17-bookworm": { + "TARGET_JAVA_VERSION": "17", + "BASE_IMAGE_VERSION_CODENAME": "bookworm" + }, + "11-bookworm": { + "TARGET_JAVA_VERSION": "11", + "BASE_IMAGE_VERSION_CODENAME": "bookworm" + }, "17-bullseye": { "TARGET_JAVA_VERSION": "17", "BASE_IMAGE_VERSION_CODENAME": "bullseye" @@ -30,6 +40,14 @@ } }, "architectures": { + "17-bookworm": [ + "linux/amd64", + "linux/arm64" + ], + "11-bookworm": [ + "linux/amd64", + "linux/arm64" + ], "17-bullseye": [ "linux/amd64", "linux/arm64" @@ -49,13 +67,20 @@ "java:${VERSION}-${VARIANT}" ], "variantTags": { - "17-bullseye": [ + "17-bookworm": [ "java:${VERSION}-17", + "java:${VERSION}-17-jdk-bookworm", + "java:${VERSION}-bookworm" + ], + "11-bookworm": [ + "java:${VERSION}-11", + "java:${VERSION}-11-jdk-bookworm" + ], + "17-bullseye": [ "java:${VERSION}-17-jdk-bullseye", "java:${VERSION}-bullseye" ], "11-bullseye": [ - "java:${VERSION}-11", "java:${VERSION}-11-jdk-bullseye" ], "17-jdk-buster": [ diff --git a/src/java/test-project/test-utils.sh b/src/java/test-project/test-utils.sh index fb02d9ae2..a29af4c46 100644 --- a/src/java/test-project/test-utils.sh +++ b/src/java/test-project/test-utils.sh @@ -126,7 +126,7 @@ checkCommon() libc6 \ libgcc1 \ libgssapi-krb5-2 \ - liblttng-ust0 \ + liblttng-ust1 \ libstdc++6 \ zlib1g \ locales \ diff --git a/src/javascript-node/.devcontainer/Dockerfile b/src/javascript-node/.devcontainer/Dockerfile index 7554c6bba..eb7fd4fa2 100644 --- a/src/javascript-node/.devcontainer/Dockerfile +++ b/src/javascript-node/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 20-bullseye, 18-bullseye, 16-bullseye, 20-buster, 18-buster, 16-buster -ARG VARIANT=20-bullseye +# [Choice] Node.js version (use -bookworm, and -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 20-bookworm, 18-bookworm, 16-bookworm 20-bullseye, 18-bullseye, 16-bullseye, 20-buster, 18-buster, 16-buster +ARG VARIANT=20-bookworm FROM node:${VARIANT} ARG USERNAME=node diff --git a/src/javascript-node/README.md b/src/javascript-node/README.md index 5594711d8..a2eacd93e 100644 --- a/src/javascript-node/README.md +++ b/src/javascript-node/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published image* | mcr.microsoft.com/devcontainers/javascript-node | -| *Available image variants* | 20 / 20-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 20-buster, 18-buster, 16-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) | -| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants | +| *Available image variants* | 20 / 20-bookworm, 18 / 18-bookworm, 16 / 16-bookworm, 20-bullseye, 18-bullseye, 16-bullseye, 20-buster, 18-buster, 16-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) | +| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | | *Languages, platforms* | Node.js, JavaScript | @@ -20,9 +20,9 @@ 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. - `mcr.microsoft.com/devcontainers/javascript-node` (latest) -- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-bullseye`, `20-buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/javascript-node:18` (or `18-bullseye`, `18-buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/javascript-node:16` (or `16-bullseye`, `16-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-bookworm`, `20-bullseye`, `20-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/javascript-node:18` (or `18-bookworm`, `18-bullseye`, `18-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/javascript-node:16` (or `16-bookworm`, `16-bullseye`, `16-buster` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. diff --git a/src/javascript-node/manifest.json b/src/javascript-node/manifest.json index e2b211c47..15d42b1ce 100644 --- a/src/javascript-node/manifest.json +++ b/src/javascript-node/manifest.json @@ -1,6 +1,9 @@ { "version": "0.205.2", "variants": [ + "20-bookworm", + "18-bookworm", + "16-bookworm", "20-bullseye", "18-bullseye", "16-bullseye", @@ -9,9 +12,21 @@ "16-buster" ], "build": { - "latest": "20-bullseye", + "latest": "20-bookworm", "rootDistro": "debian", "architectures": { + "20-bookworm": [ + "linux/amd64", + "linux/arm64" + ], + "18-bookworm": [ + "linux/amd64", + "linux/arm64" + ], + "16-bookworm": [ + "linux/amd64", + "linux/arm64" + ], "20-bullseye": [ "linux/amd64", "linux/arm64" @@ -38,16 +53,19 @@ "javascript-node:${VERSION}-${VARIANT}" ], "variantTags": { - "20-bullseye": [ + "20-bookworm": [ "javascript-node:${VERSION}-20", - "javascript-node:${VERSION}-bullseye" + "javascript-node:${VERSION}-bookworm" ], - "18-bullseye": [ + "18-bookworm": [ "javascript-node:${VERSION}-18" ], - "16-bullseye": [ + "16-bookworm": [ "javascript-node:${VERSION}-16" ], + "20-bullseye": [ + "javascript-node:${VERSION}-bullseye" + ], "20-buster": [ "javascript-node:${VERSION}-buster" ] diff --git a/src/javascript-node/test-project/test-utils.sh b/src/javascript-node/test-project/test-utils.sh index 642e13294..4c932567e 100644 --- a/src/javascript-node/test-project/test-utils.sh +++ b/src/javascript-node/test-project/test-utils.sh @@ -99,7 +99,7 @@ checkCommon() libc6 \ libgcc1 \ libgssapi-krb5-2 \ - liblttng-ust0 \ + liblttng-ust1 \ libstdc++6 \ zlib1g \ locales \ diff --git a/src/rust/.devcontainer/Dockerfile b/src/rust/.devcontainer/Dockerfile index 62c30be08..0230da837 100644 --- a/src/rust/.devcontainer/Dockerfile +++ b/src/rust/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye -ARG VARIANT="bullseye" +# [Choice] Debian OS version (use bookworm, or bullseye on local arm64/Apple Silicon): bookworm, buster, bullseye +ARG VARIANT="bookworm" FROM rust:1-${VARIANT} RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/src/rust/README.md b/src/rust/README.md index 1c46993eb..28b891972 100644 --- a/src/rust/README.md +++ b/src/rust/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/rust | -| *Available image variants* | buster, bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/rust/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/rust/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* | Rust | @@ -21,16 +21,16 @@ See **[history](history)** for information on the contents of published images. 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. -- `mcr.microsoft.com/devcontainers/rust:latest` (or `bullseye`, `buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/rust:1` (or `1-bullseye`, `1-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/rust:latest` (or `bookworm`, `bullseye`, `buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/rust:1` (or `1-bookworm`, `1-bullseye`, `1-buster` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. 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/rust:0-1` (or `0-1-bullseye`, `0-1-buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/rust:0.202-1` (or `0.202-1-bullseye`, `0.202-1-buster` to pin to an OS version) -- `mcr.microsoft.com/devcontainers/rust:0.202.0-1` (or `0.202.0-1-bullseye`, `0.202.0-1-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/rust:0-1` (or `0-1-bookworm`, `0-1-bullseye`, `0-1-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/rust:0.202-1` (or `0.202-1-bookworm`, `0.202-1-bullseye`, `0.202-1-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/rust:0.202.0-1` (or `0.202.0-1-bookworm`, `0.202.0-1-bullseye`, `0.202.0-1-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. `0-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. diff --git a/src/rust/manifest.json b/src/rust/manifest.json index 5de78fa81..e50846141 100644 --- a/src/rust/manifest.json +++ b/src/rust/manifest.json @@ -1,13 +1,18 @@ { "version": "0.203.12", "variants": [ + "bookworm", "buster", "bullseye" ], "build": { - "latest": "bullseye", + "latest": "bookworm", "rootDistro": "debian", "architectures": { + "bookworm": [ + "linux/amd64", + "linux/arm64" + ], "bullseye": [ "linux/amd64", "linux/arm64" @@ -24,8 +29,11 @@ "rust:${VERSION}-1-buster" ], "bullseye": [ - "rust:${VERSION}-1", "rust:${VERSION}-1-bullseye" + ], + "bookworm": [ + "rust:${VERSION}-1", + "rust:${VERSION}-1-bookworm" ] } }, diff --git a/src/rust/test-project/test-utils.sh b/src/rust/test-project/test-utils.sh index fd154a8c3..ed74beda6 100644 --- a/src/rust/test-project/test-utils.sh +++ b/src/rust/test-project/test-utils.sh @@ -126,7 +126,7 @@ checkCommon() libc6 \ libgcc1 \ libgssapi-krb5-2 \ - liblttng-ust0 \ + liblttng-ust1 \ libstdc++6 \ zlib1g \ locales \