Skip to content

Commit aa6ce63

Browse files
Kaniska244Kaniska244
authored
[javascript-node, typescript-node] - Node 18 EOL changes. (devcontainers#1391)
* Node 18 EOL changes. * To resolve conflict * Version bump * Major version bump * Major version bump correctly as per review comments.
1 parent 545e9e5 commit aa6ce63

File tree

4 files changed

+13
-41
lines changed

4 files changed

+13
-41
lines changed

‎src/javascript-node/README.md‎

Lines changed: 4 additions & 5 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/javascript-node |
12-
| *Available image variants* | 22 / 22-bookworm, 20 / 20-bookworm, 18 / 18-bookworm, 20-bullseye, 18-bullseye, ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
12+
| *Available image variants* | 22 / 22-bookworm, 20 / 20-bookworm, 20-bullseye, ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-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 |
@@ -22,15 +22,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2222
- `mcr.microsoft.com/devcontainers/javascript-node` (latest)
2323
- `mcr.microsoft.com/devcontainers/javascript-node:22` (or `22-bookworm`, `22-bullseye` to pin to an OS version)
2424
- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-bookworm`, `20-bullseye` to pin to an OS version)
25-
- `mcr.microsoft.com/devcontainers/javascript-node:18` (or `18-bookworm`, `18-bullseye` to pin to an OS version)
2625

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

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

31-
- `mcr.microsoft.com/devcontainers/typescript-node:1-22` (or `1-22-bookworm`, `1-22-bullseye`)
32-
- `mcr.microsoft.com/devcontainers/typescript-node:1.1-22` (or `1.1-22-bookworm`, `1.1-22-bullseye`)
33-
- `mcr.microsoft.com/devcontainers/typescript-node:1.1.0-22` (or `1.1.0-22-bookworm`, `1.1.0-22-bullseye`)
30+
- `mcr.microsoft.com/devcontainers/typescript-node:2-22` (or `2-22-bookworm`, `2-22-bullseye`)
31+
- `mcr.microsoft.com/devcontainers/typescript-node:2.0-22` (or `2.0-22-bookworm`, `2.0-22-bullseye`)
32+
- `mcr.microsoft.com/devcontainers/typescript-node:2.0.0-22` (or `2.0.0-22-bookworm`, `2.0.0-22-bullseye`)
3433

3534
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.0`). 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.
3635

‎src/javascript-node/manifest.json‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
2-
"version": "1.1.13",
2+
"version": "2.0.0",
33
"variants": [
44
"22-bookworm",
55
"20-bookworm",
6-
"18-bookworm",
76
"22-bullseye",
8-
"20-bullseye",
9-
"18-bullseye"
7+
"20-bullseye"
108
],
119
"build": {
1210
"latest": "22-bookworm",
@@ -20,21 +18,13 @@
2018
"linux/amd64",
2119
"linux/arm64"
2220
],
23-
"18-bookworm": [
24-
"linux/amd64",
25-
"linux/arm64"
26-
],
2721
"22-bullseye": [
2822
"linux/amd64",
2923
"linux/arm64"
3024
],
3125
"20-bullseye": [
3226
"linux/amd64",
3327
"linux/arm64"
34-
],
35-
"18-bullseye": [
36-
"linux/amd64",
37-
"linux/arm64"
3828
]
3929
},
4030
"tags": [
@@ -48,9 +38,6 @@
4838
"20-bookworm": [
4939
"javascript-node:${VERSION}-20"
5040
],
51-
"18-bookworm": [
52-
"javascript-node:${VERSION}-18"
53-
],
5441
"22-bullseye": [
5542
"javascript-node:${VERSION}-bullseye"
5643
]

‎src/typescript-node/README.md‎

Lines changed: 5 additions & 6 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* | 22 / 22-bookworm, 20 / 20-bookworm, 18 / 18-bookworm, 22-bullseye, 20-bullseye, 18-bullseye, 20-buster, 18-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
12+
| *Available image variants* | 22 / 22-bookworm, 20 / 20-bookworm, 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 |
@@ -21,16 +21,15 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2121

2222
- `mcr.microsoft.com/devcontainers/typescript-node` (latest)
2323
- `mcr.microsoft.com/devcontainers/typescript-node:22` (or `22-bookworm`, `22-bullseye` to pin to an OS version)
24-
- `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bookworm`, `20-bullseye`, `20-buster` to pin to an OS version)
25-
- `mcr.microsoft.com/devcontainers/typescript-node:18` (or `18-bookworm`, `18-bullseye`, `18-buster` to pin to an OS version)
24+
- `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bookworm`, `20-bullseye` to pin to an OS version)
2625

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

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

31-
- `mcr.microsoft.com/devcontainers/typescript-node:1-22` (or `1-22-bookworm`, `1-22-bullseye`)
32-
- `mcr.microsoft.com/devcontainers/typescript-node:1.1-22` (or `1.1-22-bookworm`, `1.1-22-bullseye`)
33-
- `mcr.microsoft.com/devcontainers/typescript-node:1.1.0-22` (or `1.1.0-20-bookworm`, `1.1.0-20-bullseye`)
30+
- `mcr.microsoft.com/devcontainers/typescript-node:2-22` (or `2-22-bookworm`, `2-22-bullseye`)
31+
- `mcr.microsoft.com/devcontainers/typescript-node:2.0-22` (or `2.0-22-bookworm`, `2.0-22-bullseye`)
32+
- `mcr.microsoft.com/devcontainers/typescript-node:2.0.0-22` (or `2.0.0-22-bookworm`, `2.0.0-22-bullseye`)
3433

3534
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.20`). 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.
3635

‎src/typescript-node/manifest.json‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
2-
"version": "1.1.13",
2+
"version": "2.0.0",
33
"variants": [
44
"22-bookworm",
55
"20-bookworm",
6-
"18-bookworm",
76
"22-bullseye",
8-
"20-bullseye",
9-
"18-bullseye"
7+
"20-bullseye"
108
],
119
"build": {
1210
"latest": "22-bookworm",
@@ -21,21 +19,13 @@
2119
"linux/amd64",
2220
"linux/arm64"
2321
],
24-
"18-bookworm": [
25-
"linux/amd64",
26-
"linux/arm64"
27-
],
2822
"22-bullseye": [
2923
"linux/amd64",
3024
"linux/arm64"
3125
],
3226
"20-bullseye": [
3327
"linux/amd64",
3428
"linux/arm64"
35-
],
36-
"18-bullseye": [
37-
"linux/amd64",
38-
"linux/arm64"
3929
]
4030
},
4131
"tags": [
@@ -49,9 +39,6 @@
4939
"20-bookworm": [
5040
"typescript-node:${VERSION}-20"
5141
],
52-
"18-bookworm": [
53-
"typescript-node:${VERSION}-18"
54-
],
5542
"22-bullseye": [
5643
"typescript-node:${VERSION}-bullseye"
5744
],

0 commit comments

Comments
 (0)