Prep for Node 18 release, Node 12 deprecation (#1398)

Chuxel · joshspicer · web-flow · commit b530e446388e · 2022-04-25T07:04:08.000-04:00
Co-authored-by: Josh Spicer &lt;josh@joshspicer.com&gt;
diff --git a/containers/dapr-javascript-node/.devcontainer/Dockerfile b/containers/dapr-javascript-node/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-# [Choice] Node.js version: 14, 12, 10
-ARG VARIANT=14
+# [Choice] Node.js version: 18, 16, 14
+ARG VARIANT=16
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
 
 # [Option] Enable non-root Docker access in container
diff --git a/containers/dapr-javascript-node/.devcontainer/docker-compose.yml b/containers/dapr-javascript-node/.devcontainer/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        variant: 14
+        variant: 16-bullseye
 
     environment:
       DAPR_NETWORK: dapr-dev-container
diff --git a/containers/elm/.devcontainer/Dockerfile b/containers/elm/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:12
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:16
 
 # Configuring Elm version
 ARG ELM_VERSION=latest-0.19.1
diff --git a/containers/hugo/.devcontainer/Dockerfile b/containers/hugo/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-# Update the NODE_VERSION arg in docker-compose.yml to pick a Node version: 10, 12, 14
-ARG NODE_VERSION=14
+# Update the NODE_VERSION arg in docker-compose.yml to pick a Node version: 18, 16, 14
+ARG NODE_VERSION=16
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${NODE_VERSION}
 
 # VARIANT can be either 'hugo' for the standard version or 'hugo_extended' for the extended version.
diff --git a/containers/javascript-node-azurite/.devcontainer/Dockerfile b/containers/javascript-node-azurite/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
 USER root
diff --git a/containers/javascript-node-azurite/.devcontainer/docker-compose.yml b/containers/javascript-node-azurite/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12.
+        # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
         VARIANT: 16-bullseye
diff --git a/containers/javascript-node-mongo/.devcontainer/Dockerfile b/containers/javascript-node-mongo/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
diff --git a/containers/javascript-node-mongo/.devcontainer/docker-compose.yml b/containers/javascript-node-mongo/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12.
+        # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
         VARIANT: 14-buster
diff --git a/containers/javascript-node-postgres/.devcontainer/Dockerfile b/containers/javascript-node-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
diff --git a/containers/javascript-node-postgres/.devcontainer/docker-compose.yml b/containers/javascript-node-postgres/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12.
+        # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
         VARIANT: 16-bullseye
diff --git a/containers/javascript-node-postgres/README.md b/containers/javascript-node-postgres/README.md
@@ -25,10 +25,10 @@ build:
   context: .
   dockerfile: Dockerfile
   args:
-    # Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12.
+    # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
     # Append -bullseye or -buster to pin to an OS version.
     # Use -bullseye variants on local arm64/Apple Silicon.
-    VARIANT: 14-bullseye
+    VARIANT: 16-bullseye
 ```
 
 You also can connect to PostgreSQL from an external tool when using VS Code by updating `.devcontainer/devcontainer.json` as follows:
diff --git a/containers/javascript-node/.devcontainer/Dockerfile b/containers/javascript-node/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
 
diff --git a/containers/javascript-node/.devcontainer/base.Dockerfile b/containers/javascript-node/.devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM node:${VARIANT}
 
diff --git a/containers/javascript-node/.devcontainer/devcontainer.json b/containers/javascript-node/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 	"name": "Node.js",
 	"build": {
 		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick a Node version: 16, 14, 12.
+		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
 		// Append -bullseye or -buster to pin to an OS version.
 		// Use -bullseye variants on local arm64/Apple Silicon.
 		"args": { "VARIANT": "16-bullseye" }
diff --git a/containers/javascript-node/README.md b/containers/javascript-node/README.md
@@ -10,7 +10,7 @@
 | *Categories* | Core, Languages |
 | *Definition type* | Dockerfile |
 | *Published image* | mcr.microsoft.com/vscode/devcontainers/javascript-node |
-| *Available image variants* | 12 / 12-buster, 14 / 14-buster, 16 / 16-buster, 12-bullseye, 14-bullseye, 16-bullseye ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/javascript-node/tags/list)) |
+| *Available image variants* | 18 / 18-bullseye, 16 / 16-bullseye, 14 / 14-bullseye, 18-buster, 16-buster, 14-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/javascript-node/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
 | *Works in Codespaces* | Yes |
 | *Container host OS support* | Linux, macOS, Windows |
@@ -24,24 +24,24 @@ See **[history](history)** for information on the contents of published images.
 While the definition itself works unmodified, you can select the version of Node.js the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container).
 
 ```jsonc
-// Or you can use 14-bullseye or 14-buster if you want to pin to an OS version
-"args": { "VARIANT": "14" }
+// Or you can use 16-bullseye or 16-buster if you want to pin to an OS version
+"args": { "VARIANT": "16" }
 ```
 
 You can also directly reference pre-built versions of `.devcontainer/base.Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` with one of the following:
 
 - `mcr.microsoft.com/vscode/devcontainers/javascript-node` (latest)
+- `mcr.microsoft.com/vscode/devcontainers/javascript-node:18` (or `18-bullseye`, `18-buster` to pin to an OS version)
 - `mcr.microsoft.com/vscode/devcontainers/javascript-node:16` (or `16-bullseye`, `16-buster` to pin to an OS version)
 - `mcr.microsoft.com/vscode/devcontainers/javascript-node:14` (or `14-bullseye`, `14-buster` to pin to an OS version)
-- `mcr.microsoft.com/vscode/devcontainers/javascript-node:12` (or `12-bullseye`, `12-buster` to pin to an OS version)
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0-14` (or `0-14-bullseye`, `0-14-buster`)
-- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0.204-14` (or `0.203-14-bullseye`, `0.203-14-buster`)
-- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0.204.0-14` (or `0.203.0-14-bullseye`, `0.203.0-14-buster`)
+- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0-16` (or `0-16-bullseye`, `0-16-buster`)
+- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0.204-16` (or `0.204-16-bullseye`, `0.204-16-buster`)
+- `mcr.microsoft.com/vscode/devcontainers/typescript-node:0.204.0-16` (or `0.204.0-16-bullseye`, `0.204.0-16-buster`)
 
-However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-14`). 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/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-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.
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/vscode/devcontainers/typescript-node/tags/list).
 
diff --git a/containers/javascript-node/definition-manifest.json b/containers/javascript-node/definition-manifest.json
@@ -1,30 +1,30 @@
 {
-	"variants": ["16-bullseye", "14-bullseye", "12-bullseye", "16-buster", "14-buster", "12-buster"],
-	"definitionVersion": "0.203.4",
+	"variants": ["18-bullseye", "16-bullseye", "14-bullseye", "18-buster", "16-buster", "14-buster"],
+	"definitionVersion": "0.204.0",
 	"build": {
-		"latest": "16-buster",
+		"latest": "18-bullseye",
 		"rootDistro": "debian",
 		"architectures": {
+			"18-bullseye": ["linux/amd64", "linux/arm64"],
 			"16-bullseye": ["linux/amd64", "linux/arm64"],
 			"14-bullseye": ["linux/amd64", "linux/arm64"],
-			"12-bullseye": ["linux/amd64", "linux/arm64"],
+			"18-buster": ["linux/amd64"],
 			"16-buster": ["linux/amd64"],
-			"14-buster": ["linux/amd64"],
-			"12-buster": ["linux/amd64"]
+			"14-buster": ["linux/amd64"]
 		},
 		"tags": [
 			"javascript-node:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"16-bullseye": [ 
+			"18-bullseye": [ 
+				"javascript-node:${VERSION}-18",
 				"javascript-node:${VERSION}-bullseye"
 			],
-			"16-buster": [ 
-				"javascript-node:${VERSION}-16",
+			"16-bullseye": [ "javascript-node:${VERSION}-16" ],
+			"14-bullseye": [ "javascript-node:${VERSION}-14" ],
+			"18-buster": [ 
 				"javascript-node:${VERSION}-buster"
-			],
-			"14-buster": [ "javascript-node:${VERSION}-14" ],
-			"12-buster": [ "javascript-node:${VERSION}-12" ]
+			]
 		}
 	}, 
 	"dependencies": {
diff --git a/containers/reasonml/.devcontainer/Dockerfile b/containers/reasonml/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:14-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:16-bullseye
 
 RUN sudo -u node npm install -g bs-platform esy@latest
 
diff --git a/containers/typescript-node/.devcontainer/Dockerfile b/containers/typescript-node/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
 
diff --git a/containers/typescript-node/.devcontainer/base.Dockerfile b/containers/typescript-node/.devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
diff --git a/containers/typescript-node/.devcontainer/devcontainer.json b/containers/typescript-node/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 	"name": "Node.js & TypeScript",
 	"build": {
 		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick a Node version: 16, 14, 12.
+		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
 		// Append -bullseye or -buster to pin to an OS version.
 		// Use -bullseye variants on local on arm64/Apple Silicon.
 		"args": { 
diff --git a/containers/typescript-node/definition-manifest.json b/containers/typescript-node/definition-manifest.json
@@ -1,31 +1,31 @@
 {
-	"variants": ["16-bullseye", "14-bullseye", "12-bullseye", "16-buster", "14-buster", "12-buster"],
-	"definitionVersion": "0.203.4",
+	"variants": ["18-bullseye", "16-bullseye", "14-bullseye", "18-buster", "16-buster", "14-buster"],
+	"definitionVersion": "0.204.0",
 	"build": {
 		"latest": "16-buster",
 		"rootDistro": "debian",
 		"parent": "javascript-node",
 		"architectures": {
+			"18-bullseye": ["linux/amd64", "linux/arm64"],
 			"16-bullseye": ["linux/amd64", "linux/arm64"],
 			"14-bullseye": ["linux/amd64", "linux/arm64"],
-			"12-bullseye": ["linux/amd64", "linux/arm64"],
+			"18-buster": ["linux/amd64"],
 			"16-buster": ["linux/amd64"],
-			"14-buster": ["linux/amd64"],
-			"12-buster": ["linux/amd64"]
+			"14-buster": ["linux/amd64"]
 		},
 		"tags": [
 			"typescript-node:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"16-bullseye": [ 
+			"18-bullseye": [ 
+				"typescript-node:${VERSION}-18",
 				"typescript-node:${VERSION}-bullseye"
 			],
-			"16-buster": [ 
-				"typescript-node:${VERSION}-16",
+			"16-bullseye": [ "typescript-node:${VERSION}-16" ],
+			"14-bullseye": [ "typescript-node:${VERSION}-14" ],
+			"18-buster": [ 
 				"typescript-node:${VERSION}-buster"
-			],
-			"14-buster": [ "typescript-node:${VERSION}-14" ],
-			"12-buster": [ "typescript-node:${VERSION}-12" ]
+			]
 		}
 	},
 	"dependencies": {
diff --git a/containers/vue/.devcontainer/Dockerfile b/containers/vue/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version: 16, 14, 12
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
 ARG VARIANT=16
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
diff --git a/script-library/container-features/src/devcontainer-features.json b/script-library/container-features/src/devcontainer-features.json
@@ -675,7 +675,7 @@
 			"options": {
 				"version": {
 					"type": "string",
-					"proposals": [ "lts", "latest", "16", "14", "12" ],
+					"proposals": [ "lts", "latest", "18", "16", "14" ],
 					"default": "lts",
 					"description": "Select or enter a Node.js version to install"
 				},

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:12`
	`1`	`+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:16`
`2`	`2`
`3`	`3`	`# Configuring Elm version`
`4`	`4`	`ARG ELM_VERSION=latest-0.19.1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster`
	`1`	`+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster`
`2`	`2`	`ARG VARIANT=16-bullseye`
`3`	`3`	`FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}`
`4`	`4`	`USER root`