Skip to content

Commit aea0691

Browse files
Add support for debian trixie(13)
1 parent af35181 commit aea0691

File tree

4 files changed

+33
-16
lines changed

4 files changed

+33
-16
lines changed

src/typescript-node/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=24-bookworm
1+
ARG VARIANT=24-trixie
22
FROM mcr.microsoft.com/devcontainers/javascript-node:3-${VARIANT}
33

44
# Install tslint, typescript. eslint is installed by javascript image

src/typescript-node/README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/typescript-node |
12-
| *Available image variants* | 24 / 24-bookworm, 22 / 22-bookworm, 20 / 20-bookworm, 24-bullseye, 22-bullseye, 20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
12+
| *Available image variants* | 24 / 24-trixie, 22 / 22-trixie, 20 / 20-trixie, 24-bookworm, 22-bookworm, 20-bookworm, 24-bullseye, 22-bullseye, 20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -20,17 +20,18 @@
2020
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.
2121

2222
- `mcr.microsoft.com/devcontainers/typescript-node` (latest)
23-
- `mcr.microsoft.com/devcontainers/typescript-node:24` (or `24-bookworm`, `24-bullseye` to pin to an OS version)
24-
- `mcr.microsoft.com/devcontainers/typescript-node:22` (or `22-bookworm`, `22-bullseye` to pin to an OS version)
25-
- `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bookworm`, `20-bullseye` to pin to an OS version)
23+
24+
- `mcr.microsoft.com/devcontainers/typescript-node:24` (or `24-trixie`, `24-bookworm`, `24-bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/typescript-node:22` (or `22-trixie`, `22-bookworm`, `22-bullseye` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-trixie`, `20-bookworm`, `20-bullseye` to pin to an OS version)
2627

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

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

31-
- `mcr.microsoft.com/devcontainers/typescript-node:3-24` (or `3-24-bookworm`, `3-24-bullseye`)
32-
- `mcr.microsoft.com/devcontainers/typescript-node:3.0-24` (or `3.0-24-bookworm`, `3.0-24-bullseye`)
33-
- `mcr.microsoft.com/devcontainers/typescript-node:3.0.2-24` (or `3.0.2-24-bookworm`, `3.0.2-24-bullseye`)
32+
- `mcr.microsoft.com/devcontainers/typescript-node:5-24` (or `5-24-trixie`, `5-24-bookworm`, `5-24-bullseye`)
33+
- `mcr.microsoft.com/devcontainers/typescript-node:5.0-24` (or `5.0-24-trixie`, `5.0-24-bookworm`, `5.0-24-bullseye`)
34+
- `mcr.microsoft.com/devcontainers/typescript-node:5.0.2-24` (or `5.0.2-24-trixie`, `5.0.2-24-bookworm`, `5.0.2-24-bullseye`)
3435

3536
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. `3-24`). 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.
3637

src/typescript-node/manifest.json

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
{
2-
"version": "3.0.3",
2+
"version": "5.0.0",
33
"variants": [
4-
"24-bookworm",
4+
"24-trixie",
55
"22-bookworm",
66
"20-bookworm",
77
"24-bullseye",
88
"22-bullseye",
99
"20-bullseye"
1010
],
1111
"build": {
12-
"latest": "24-bookworm",
12+
"latest": "24-trixie",
1313
"rootDistro": "debian",
1414
"parent": "javascript-node",
1515
"architectures": {
16+
"24-trixie": [
17+
"linux/amd64",
18+
"linux/arm64"
19+
],
20+
"22-trixie": [
21+
"linux/amd64",
22+
"linux/arm64"
23+
],
24+
"20-trixie": [
25+
"linux/amd64",
26+
"linux/arm64"
27+
],
1628
"24-bookworm": [
1729
"linux/amd64",
1830
"linux/arm64"
@@ -42,16 +54,19 @@
4254
"typescript-node:${VERSION}-${VARIANT}"
4355
],
4456
"variantTags": {
45-
"24-bookworm": [
46-
"typescript-node:${VERSION}-24",
47-
"typescript-node:${VERSION}-bookworm"
57+
"24-trixie": [
58+
"typescript-node:${VERSION}-24"
4859
],
49-
"22-bookworm": [
60+
"22-trixie": [
5061
"typescript-node:${VERSION}-22"
5162
],
52-
"20-bookworm": [
63+
"20-trixie": [
5364
"typescript-node:${VERSION}-20"
5465
],
66+
"24-bookworm": [
67+
"typescript-node:${VERSION}-24",
68+
"typescript-node:${VERSION}-bookworm"
69+
],
5570
"24-bullseye": [
5671
"typescript-node:${VERSION}-bullseye"
5772
]

src/universal/.devcontainer/local-features/patch-conda/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ sudo_if /opt/conda/bin/python3 -m pip install --upgrade pip
5454
# https://github.com/advisories/GHSA-h4gh-qq45-vh27
5555
update_python_package /opt/conda/bin/python3 cryptography "43.0.1"
5656

57+
#updating conda package to the latest version available
5758
update_conda_package pyopenssl "25.0.0"
5859

5960
# https://github.com/advisories/GHSA-pq67-6m6q-mj2v

0 commit comments

Comments
 (0)