Node 14 - EOL (#553)

* Node 14 - EOL * fix build
devcontainers · May 5, 2023 · 3e64ffb · 3e64ffb
1 parent 18cefbc
commit 3e64ffb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 83 deletions.
diff --git a/build/src/prep.js b/build/src/prep.js
@@ -83,10 +83,9 @@ async function prepDockerFile(devContainerDockerfilePath, definitionId, repo, re
  prepResult.devContainerDockerfileModified = replaceFrom(prepResult.devContainerDockerfileModified, `FROM ${prepResult.flattenedBaseImageTag}`);
  }
 
- // Add variant & image_variant as an argument to the dockerfile
+ // Add variant as an argument to the dockerfile
  if (variant) {
  replaceVariantArg(prepResult);
- replaceImageVariantEnv(prepResult);
  }
 
  // Generate list of other arguments if applicable and add to the dockefile
@@ -248,13 +247,6 @@ function addBuildArguments(prepResult) {
  return prepResult.devContainerDockerfileModified;
 }
 
-function replaceImageVariantEnv(prepResult) {
- const variantArg = `ENV IMAGE_VARIANT="${prepResult.meta.variant}"\n`;
-
- prepResult.devContainerDockerfileModified = (prepResult.devContainerDockerfileModified).replace(new RegExp(".*ENV IMAGE_VARIANT=.*"), variantArg);
- return prepResult.devContainerDockerfileModified;
-}
-
 module.exports = {
  createStub: createStub,
  updateStub: updateStub,

diff --git a/src/javascript-node/.devcontainer/Dockerfile b/src/javascript-node/.devcontainer/Dockerfile
@@ -1,12 +1,7 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 14, 20-bullseye, 18-bullseye, 16-bullseye, 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster
+# [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
 FROM node:${VARIANT}
 
-ENV IMAGE_VARIANT="20-bullseye"
-
-COPY library-scripts/add-patch.sh /tmp/library-scripts/
-RUN bash /tmp/library-scripts/add-patch.sh "${IMAGE_VARIANT}" && rm -rf /tmp/library-scripts
-
 ARG USERNAME=node
 ARG NPM_GLOBAL=/usr/local/share/npm-global
 

diff --git a/src/javascript-node/.devcontainer/library-scripts/add-patch.sh b/src/javascript-node/.devcontainer/library-scripts/add-patch.sh
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-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 14 / 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
+| *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 |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -23,7 +23,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `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:14` (or `14-bullseye`, `14-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
@@ -4,11 +4,9 @@
  "20-bullseye",
  "18-bullseye",
  "16-bullseye",
- "14-bullseye",
  "20-buster",
  "18-buster",
- "16-buster",
- "14-buster"
+ "16-buster"
  ],
  "build": {
  "latest": "20-bullseye",
@@ -26,10 +24,6 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "14-bullseye": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-buster": [
  "linux/amd64"
  ],
@@ -38,9 +32,6 @@
  ],
  "16-buster": [
  "linux/amd64"
- ],
- "14-buster": [
- "linux/amd64"
  ]
  },
  "tags": [
@@ -57,9 +48,6 @@
  "16-bullseye": [
  "javascript-node:${VERSION}-16"
  ],
- "14-bullseye": [
- "javascript-node:${VERSION}-14"
- ],
  "20-buster": [
  "javascript-node:${VERSION}-buster"
  ]

diff --git a/src/typescript-node/.devcontainer/Dockerfile b/src/typescript-node/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 14, 20-bullseye, 18-bullseye, 16-bullseye, 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster
+# [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
 FROM mcr.microsoft.com/devcontainers/javascript-node:0-${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-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 14 / 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
+| *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/typescript-node/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -23,15 +23,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bullseye`, `20-buster` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/typescript-node:18` (or `18-bullseye`, `18-buster` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/typescript-node:16` (or `16-bullseye`, `16-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/typescript-node:14` (or `14-bullseye`, `14-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:0-14` (or `0-14-bullseye`, `0-14-buster`)
-- `mcr.microsoft.com/devcontainers/typescript-node:0.204-14` (or `0.203-14-bullseye`, `0.203-14-buster`)
-- `mcr.microsoft.com/devcontainers/typescript-node:0.204.0-14` (or `0.203.0-14-bullseye`, `0.203.0-14-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:0-20` (or `0-20-bullseye`, `0-20-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:0.205-20` (or `0.205-20-bullseye`, `0.205-20-buster`)
+- `mcr.microsoft.com/devcontainers/typescript-node:0.205.1-20` (or `0.205.1-20-bullseye`, `0.205.1-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. `0-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.
 

diff --git a/src/typescript-node/manifest.json b/src/typescript-node/manifest.json
@@ -4,11 +4,9 @@
  "20-bullseye",
  "18-bullseye",
  "16-bullseye",
- "14-bullseye",
  "20-buster",
  "18-buster",
- "16-buster",
- "14-buster"
+ "16-buster"
  ],
  "build": {
  "latest": "20-buster",
@@ -27,10 +25,6 @@
  "linux/amd64",
  "linux/arm64"
  ],
- "14-bullseye": [
- "linux/amd64",
- "linux/arm64"
- ],
  "20-buster": [
  "linux/amd64"
  ],
@@ -39,9 +33,6 @@
  ],
  "16-buster": [
  "linux/amd64"
- ],
- "14-buster": [
- "linux/amd64"
  ]
  },
  "tags": [
@@ -58,9 +49,6 @@
  "16-bullseye": [
  "typescript-node:${VERSION}-16"
  ],
- "14-bullseye": [
- "typescript-node:${VERSION}-14"
- ],
  "20-buster": [
  "typescript-node:${VERSION}-buster"
  ]