[Typesrcipt-node][Javascript-node] EOL Node 16 (devcontainers#751)

Aaavm · Sep 13, 2023 · 19321c5 · 19321c5
1 parent bf0a298
commit 19321c5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 46 deletions.
diff --git a/src/javascript-node/.devcontainer/Dockerfile b/src/javascript-node/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [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
+# [Choice] Node.js version (use -bookworm, and -bullseye variants on local arm64/Apple Silicon): 20, 18, 20-bookworm, 18-bookworm, 20-bullseye, 18-bullseye, 20-buster, 18-buster
 ARG VARIANT=20-bookworm
 FROM node:${VARIANT}
 

diff --git a/src/javascript-node/README.md b/src/javascript-node/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published image* | mcr.microsoft.com/devcontainers/javascript-node |
-| *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)) |
+| *Available image variants* | 20 / 20-bookworm, 18 / 18-bookworm, 20-bullseye, 18-bullseye, 20-buster, 18-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 |
@@ -22,15 +22,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `mcr.microsoft.com/devcontainers/javascript-node` (latest)
 - `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.
 
 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/typescript-node:1-16` (or `1-16-bookworm`, `1-16-bullseye`, `1-16-buster`)
-- `mcr.microsoft.com/devcontainers/typescript-node:1.0-16` (or `1.0-16-bookworm`, `1.0-16-bullseye`, `1.0-16-buster`)
-- `mcr.microsoft.com/devcontainers/typescript-node:1.0.0-16` (or `1.0.0-16-bookworm`, `1.0.0-16-bullseye`, `1.0.0-16-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:1-20` (or `1-20-bookworm`, `1-20-bullseye`, `1-20-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:1.0-20` (or `1.0-20-bookworm`, `1.0-20-bullseye`, `1.0-20-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:1.0.3-20` (or `1.0.3-20-bookworm`, `1.0.3-20-bullseye`, `1.0.3-20-buster`)
 
 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.
 

diff --git a/src/javascript-node/manifest.json b/src/javascript-node/manifest.json
@@ -3,13 +3,10 @@
  "variants": [
  "20-bookworm",
  "18-bookworm",
- "16-bookworm",
  "20-bullseye",
  "18-bullseye",
- "16-bullseye",
  "20-buster",
- "18-buster",
- "16-buster"
+ "18-buster"
  ],
  "build": {
  "latest": "20-bookworm",
@@ -23,10 +20,6 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "16-bookworm": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-bullseye": [
  "linux/amd64",
  "linux/arm64"
@@ -35,18 +28,11 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "16-bullseye": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-buster": [
  "linux/amd64"
  ],
  "18-buster": [
  "linux/amd64"
- ],
- "16-buster": [
- "linux/amd64"
  ]
  },
  "tags": [
@@ -60,9 +46,6 @@
  "18-bookworm": [
  "javascript-node:${VERSION}-18"
  ],
- "16-bookworm": [
- "javascript-node:${VERSION}-16"
- ],
  "20-bullseye": [
  "javascript-node:${VERSION}-bullseye"
  ],

diff --git a/src/typescript-node/.devcontainer/Dockerfile b/src/typescript-node/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bookworm, or -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
+# [Choice] Node.js version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): 20, 18, 20-bookworm, 18-bookworm, 20-bullseye, 18-bullseye, 20-buster, 18-buster
 ARG VARIANT=20-bookworm
 FROM mcr.microsoft.com/devcontainers/javascript-node:1-${VARIANT}
 

diff --git a/src/typescript-node/README.md b/src/typescript-node/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published image* | mcr.microsoft.com/devcontainers/typescript-node |
-| *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/typescript-node/tags/list)) |
+| *Available image variants* | 20 / 20-bookworm, 18 / 18-bookworm, 20-bullseye, 18-bullseye, 20-buster, 18-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-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 |
@@ -22,7 +22,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `mcr.microsoft.com/devcontainers/typescript-node` (latest)
 - `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bookworm`, `20-bullseye`, `20-buster` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/typescript-node:18` (or `18-bookworm`, `18-bullseye`, `18-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/typescript-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.
 
@@ -32,7 +31,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 - `mcr.microsoft.com/devcontainers/typescript-node:1.0-20` (or `1.0-20-bookworm`, `1.0-20-bullseye`, `1.0-20-buster`)
 - `mcr.microsoft.com/devcontainers/typescript-node:1.0.0-20` (or `1.0.0-20-bookworm`, `1.0.0-20-bullseye`, `1.0.0-20-buster`)
 
-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.16`). 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.
+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.
 
 Beyond TypeScript, Node.js, and `git`, this image / `Dockerfile` includes `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `node` user with `sudo` access, and a set of common dependencies for development. Since `tslint` is [now fully deprecated](https://github.com/palantir/tslint/issues/4534), the image includes `tslint-to-eslint-config` globally to help you migrate.
 

diff --git a/src/typescript-node/manifest.json b/src/typescript-node/manifest.json
@@ -3,13 +3,10 @@
  "variants": [
  "20-bookworm",
  "18-bookworm",
- "16-bookworm",
  "20-bullseye",
  "18-bullseye",
- "16-bullseye",
  "20-buster",
- "18-buster",
- "16-buster"
+ "18-buster"
  ],
  "build": {
  "latest": "20-bookworm",
@@ -24,10 +21,6 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "16-bookworm": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-bullseye": [
  "linux/amd64",
  "linux/arm64"
@@ -36,18 +29,11 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "16-bullseye": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-buster": [
  "linux/amd64"
  ],
  "18-buster": [
  "linux/amd64"
- ],
- "16-buster": [
- "linux/amd64"
  ]
  },
  "tags": [
@@ -61,9 +47,6 @@
  "18-bookworm": [
  "typescript-node:${VERSION}-18"
  ],
- "16-bookworm": [
- "typescript-node:${VERSION}-16"
- ],
  "20-bullseye": [
  "typescript-node:${VERSION}-bullseye"
  ],